ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ssakasht push origin master-patch-3'

This commit is contained in:
Gregory Hainaut 2015-05-28 18:31:35 +02:00
parent 83afc0622c 8e32d71c07
commit cbca0692ed
10 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GSdx/GPUSettingsDlg.cpp
View File

@ -148,4 +148,4 @@ void GPUSettingsDlg::UpdateControls()
EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS_EDIT), sw); EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS_EDIT), sw);
EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS), sw); EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS), sw);
} }
} }

2
plugins/GSdx/GSSettingsDlg.cpp
View File

@ -413,7 +413,7 @@ void GSSettingsDlg::UpdateControls()
ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO9), dx9 ? SW_SHOW : SW_HIDE); ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO9), dx9 ? SW_SHOW : SW_HIDE);
ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO11), dx11 ? SW_SHOW : SW_HIDE); ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO11), dx11 ? SW_SHOW : SW_HIDE);
ShowWindow(GetDlgItem(m_hWnd, IDC_LOGOGL), ogl ? SW_SHOW : SW_HIDE);
EnableWindow(GetDlgItem(m_hWnd, IDC_OPENCL_DEVICE), ocl); EnableWindow(GetDlgItem(m_hWnd, IDC_OPENCL_DEVICE), ocl);
EnableWindow(GetDlgItem(m_hWnd, IDC_WINDOWED), dx9); EnableWindow(GetDlgItem(m_hWnd, IDC_WINDOWED), dx9);
EnableWindow(GetDlgItem(m_hWnd, IDC_RESX), hw && !native && scaling == 1); EnableWindow(GetDlgItem(m_hWnd, IDC_RESX), hw && !native && scaling == 1);

4
plugins/GSdx/GSdx.rc
View File

@ -82,6 +82,7 @@ IDR_TFX_CL RCDATA "res\\tfx.cl"
IDB_LOGO9 BITMAP "res\\logo9.bmp" IDB_LOGO9 BITMAP "res\\logo9.bmp"
IDB_LOGO10 BITMAP "res\\logo10.bmp" IDB_LOGO10 BITMAP "res\\logo10.bmp"
IDB_LOGOGL BITMAP "res\\logo-ogl.bmp"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
@ -258,7 +259,8 @@ BEGIN
CONTROL "Edge Anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,319,93,10 CONTROL "Edge Anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,319,93,10
PUSHBUTTON "Cancel",IDCANCEL,95,346,50,14 PUSHBUTTON "Cancel",IDCANCEL,95,346,50,14
CONTROL IDB_LOGO9,IDC_LOGO9,"Static",SS_BITMAP | SS_CENTERIMAGE,6,6,175,44 CONTROL IDB_LOGO9,IDC_LOGO9,"Static",SS_BITMAP | SS_CENTERIMAGE,6,6,175,44
GROUPBOX "D3D Internal Resolution (can cause glitches)",IDC_STATIC,6,116,175,64,BS_CENTER CONTROL IDB_LOGOGL,IDC_LOGOGL,"Static",SS_BITMAP | SS_CENTERIMAGE,6,6,175,42
GROUPBOX "Internal Resolution (can cause glitches)",IDC_STATIC,6,116,175,64,BS_CENTER
GROUPBOX "Software Mode Settings",IDC_STATIC,6,290,175,50,BS_CENTER GROUPBOX "Software Mode Settings",IDC_STATIC,6,290,175,50,BS_CENTER
GROUPBOX "Hardware Mode Settings",IDC_STATIC,6,214,175,74,BS_CENTER GROUPBOX "Hardware Mode Settings",IDC_STATIC,6,214,175,74,BS_CENTER
CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,227,58,10 CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,227,58,10

1
plugins/GSdx/GSdx.vcxproj
View File

@ -1695,6 +1695,7 @@
<None Include="res\cs.fx" /> <None Include="res\cs.fx" />
<None Include="res\fxaa.fx" /> <None Include="res\fxaa.fx" />
<None Include="res\logo10.bmp" /> <None Include="res\logo10.bmp" />
<None Include="res\logo-ogl.bmp" />
<None Include="res\logo9.bmp" /> <None Include="res\logo9.bmp" />
<None Include="res\convert.fx" /> <None Include="res\convert.fx" />
<None Include="res\interlace.fx" /> <None Include="res\interlace.fx" />

3
plugins/GSdx/GSdx.vcxproj.filters
View File

@ -706,6 +706,9 @@
<None Include="res\logo9.bmp"> <None Include="res\logo9.bmp">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
<None Include="res\logo-ogl.bmp">
<Filter>Resource Files</Filter>
</None>
<None Include="res\convert.fx"> <None Include="res\convert.fx">
<Filter>Shaders</Filter> <Filter>Shaders</Filter>
</None> </None>

3
plugins/GSdx/GSdx_vs2012.vcxproj
View File

@ -2053,6 +2053,7 @@
<None Include="res\fxaa.fx" /> <None Include="res\fxaa.fx" />
<None Include="res\logo10.bmp" /> <None Include="res\logo10.bmp" />
<None Include="res\logo9.bmp" /> <None Include="res\logo9.bmp" />
<None Include="res\logo-ogl.bmp" />
<None Include="res\convert.fx" /> <None Include="res\convert.fx" />
<None Include="res\interlace.fx" /> <None Include="res\interlace.fx" />
<None Include="res\merge.fx" /> <None Include="res\merge.fx" />
@ -2072,4 +2073,4 @@
<UserProperties RESOURCE_FILE="GSdx.rc" /> <UserProperties RESOURCE_FILE="GSdx.rc" />
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
</Project> </Project>

5
plugins/GSdx/GSdx_vs2012.vcxproj.filters
View File

@ -714,6 +714,9 @@
</None> </None>
<None Include="res\logo9.bmp"> <None Include="res\logo9.bmp">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None>
<None Include="res\logo-ogl.bmp">
<Filter>Resource Files</Filter>
</None> </None>
<None Include="res\convert.fx"> <None Include="res\convert.fx">
<Filter>Shaders</Filter> <Filter>Shaders</Filter>
@ -749,4 +752,4 @@
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

3
plugins/GSdx/GSdx_vs2013.vcxproj
View File

@ -2065,6 +2065,7 @@
<None Include="res\fxaa.fx" /> <None Include="res\fxaa.fx" />
<None Include="res\logo10.bmp" /> <None Include="res\logo10.bmp" />
<None Include="res\logo9.bmp" /> <None Include="res\logo9.bmp" />
<None Include="res\logo_ogl.bmp" />
<None Include="res\convert.fx" /> <None Include="res\convert.fx" />
<None Include="res\interlace.fx" /> <None Include="res\interlace.fx" />
<None Include="res\merge.fx" /> <None Include="res\merge.fx" />
@ -2085,4 +2086,4 @@
<UserProperties RESOURCE_FILE="GSdx.rc" /> <UserProperties RESOURCE_FILE="GSdx.rc" />
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
</Project> </Project>

5
plugins/GSdx/GSdx_vs2013.vcxproj.filters
View File

@ -720,6 +720,9 @@
</None> </None>
<None Include="res\logo9.bmp"> <None Include="res\logo9.bmp">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None>
<None Include="res\logo-ogl.bmp">
<Filter>Resource Files</Filter>
</None> </None>
<None Include="res\convert.fx"> <None Include="res\convert.fx">
<Filter>Shaders</Filter> <Filter>Shaders</Filter>
@ -758,4 +761,4 @@
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

40
plugins/GSdx/resource.h
View File

@ -18,25 +18,27 @@
#define IDD_CONFIG 2020 #define IDD_CONFIG 2020
#define IDB_LOGO9 2021 #define IDB_LOGO9 2021
#define IDB_LOGO10 2022 #define IDB_LOGO10 2022
#define IDC_FBA 2023 #define IDB_LOGOGL 2023
#define IDC_LOGO9 2024 #define IDC_FBA 2024
#define IDC_LOGO11 2025 #define IDC_LOGO9 2025
#define IDD_CAPTURE 2026 #define IDC_LOGO11 2026
#define IDD_GPUCONFIG 2027 #define IDC_LOGOGL 2027
#define IDC_RENDERER 2029 #define IDD_CAPTURE 2028
#define IDC_INTERLACE 2030 #define IDD_GPUCONFIG 2029
#define IDC_ASPECTRATIO 2031 #define IDC_RENDERER 2030
#define IDC_ALPHAHACK 2032 #define IDC_INTERLACE 2031
#define IDC_SWTHREADS 2033 #define IDC_ASPECTRATIO 2032
#define IDC_SCALE 2034 #define IDC_ALPHAHACK 2033
#define IDC_UPSCALE_MULTIPLIER 2035 #define IDC_SWTHREADS 2034
#define IDC_BROWSE 2036 #define IDC_SCALE 2035
#define IDC_OFFSETHACK 2037 #define IDC_UPSCALE_MULTIPLIER 2036
#define IDC_FILENAME 2038 #define IDC_BROWSE 2037
#define IDC_SKIPDRAWHACK 2039 #define IDC_OFFSETHACK 2038
#define IDC_WIDTH 2040 #define IDC_FILENAME 2039
#define IDC_HEIGHT 2041 #define IDC_SKIPDRAWHACK 2040
#define IDC_CONFIGURE 2042 #define IDC_WIDTH 2041
#define IDC_HEIGHT 2042
#define IDC_CONFIGURE 2043
#define IDC_WINDOWED 2046 #define IDC_WINDOWED 2046
#define IDC_SKIPDRAWHACKEDIT 2048 #define IDC_SKIPDRAWHACKEDIT 2048
#define IDC_SPRITEHACK 2051 #define IDC_SPRITEHACK 2051