diff --git a/plugins/GSdx/GPU.cpp b/plugins/GSdx/GPU.cpp index 2c67f8a605..8b2bf21552 100644 --- a/plugins/GSdx/GPU.cpp +++ b/plugins/GSdx/GPU.cpp @@ -110,18 +110,22 @@ EXPORT_C_(int32) GPUopen(void* hWnd) return -1; #endif - int renderer = theApp.GetConfig("Renderer", 1); + GPURendererType renderer = static_cast(theApp.GetConfig("Renderer", static_cast(GPURendererType::D3D9_SW))); int threads = theApp.GetConfig("extrathreads", DEFAULT_EXTRA_RENDERING_THREADS); switch(renderer) { - default: - #ifdef _WIN32 - case 0: s_gpu = new GPURendererSW(new GSDevice9(), threads); break; - case 1: s_gpu = new GPURendererSW(new GSDevice11(), threads); break; - #endif - case 3: s_gpu = new GPURendererSW(new GSDeviceNull(), threads); break; - //case 4: s_gpu = new GPURendererNull(new GSDeviceNull()); break; +#ifdef _WIN32 + case GPURendererType::D3D9_SW: s_gpu = new GPURendererSW(new GSDevice9(), threads); break; + case GPURendererType::D3D11_SW: s_gpu = new GPURendererSW(new GSDevice11(), threads); break; +#endif + case GPURendererType::NULL_Renderer: s_gpu = new GPURendererSW(new GSDeviceNull(), threads); break; + default: // Fall back to D3D9/null mode if unknown value is read. No one could possibly enter here anyway. +#ifdef _WIN32 + s_gpu = new GPURendererSW(new GSDevice9(), threads); break; +#else + s_gpu = new GPURendererSW(new GSDeviceNull(), threads); break; +#endif } if(!s_gpu->Create(hWnd)) diff --git a/plugins/GSdx/GPU.h b/plugins/GSdx/GPU.h index 18342ea3d6..ee599b58e3 100644 --- a/plugins/GSdx/GPU.h +++ b/plugins/GSdx/GPU.h @@ -264,6 +264,13 @@ REG32_SET(GPUReg) GPURegCLUT CLUT; REG_SET_END +enum class GPURendererType : int8 +{ + D3D9_SW, + D3D11_SW, + NULL_Renderer, +}; + struct GPUFreezeData { uint32 version; // == 1 diff --git a/plugins/GSdx/GPUSettingsDlg.cpp b/plugins/GSdx/GPUSettingsDlg.cpp index bdbcecb9b3..a862d91089 100644 --- a/plugins/GSdx/GPUSettingsDlg.cpp +++ b/plugins/GSdx/GPUSettingsDlg.cpp @@ -21,6 +21,7 @@ #include "stdafx.h" #include "GSdx.h" +#include "GPU.h" #include "GSUtil.h" #include "GPUSettingsDlg.h" #include "resource.h" @@ -65,7 +66,7 @@ void GPUSettingsDlg::OnInit() } } - ComboBoxInit(IDC_RENDERER, theApp.m_gpu_renderers, theApp.GetConfig("Renderer", 0)); + ComboBoxInit(IDC_RENDERER, theApp.m_gpu_renderers, theApp.GetConfig("Renderer", static_cast(GPURendererType::D3D9_SW))); ComboBoxInit(IDC_FILTER, theApp.m_gpu_filter, theApp.GetConfig("filter", 0)); ComboBoxInit(IDC_DITHERING, theApp.m_gpu_dithering, theApp.GetConfig("dithering", 1)); ComboBoxInit(IDC_ASPECTRATIO, theApp.m_gpu_aspectratio, theApp.GetConfig("AspectRatio", 1)); @@ -137,12 +138,16 @@ void GPUSettingsDlg::UpdateControls() if(ComboBoxGetSelData(IDC_RENDERER, i)) { - bool dx9 = i == 0; - bool dx11 = i == 1; - bool sw = i >= 0 && i <= 2; + GPURendererType renderer = static_cast(i); - ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO9), dx9 ? SW_SHOW : SW_HIDE); - ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO11), dx11 ? SW_SHOW : SW_HIDE); + bool dx9 = renderer == GPURendererType::D3D9_SW; + bool dx11 = renderer == GPURendererType::D3D11_SW; + bool null = renderer == GPURendererType::NULL_Renderer; + bool sw = !null; + + ShowWindow(GetDlgItem(m_hWnd, IDC_PSX_LOGO9), dx9 ? SW_SHOW : SW_HIDE); + ShowWindow(GetDlgItem(m_hWnd, IDC_PSX_LOGO11), dx11 ? SW_SHOW : SW_HIDE); + ShowWindow(GetDlgItem(m_hWnd, IDC_PSX_NULL), null ? SW_SHOW : SW_HIDE); EnableWindow(GetDlgItem(m_hWnd, IDC_SCALE), sw); EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS_EDIT), sw); diff --git a/plugins/GSdx/GS.cpp b/plugins/GSdx/GS.cpp index 89dc42c51f..7415fcaa0a 100644 --- a/plugins/GSdx/GS.cpp +++ b/plugins/GSdx/GS.cpp @@ -216,18 +216,14 @@ static int _GSopen(void** dsp, const char* title, GSRendererType renderer, int t { case GSRendererType::DX9_SW: case GSRendererType::DX1011_SW: - case GSRendererType::Null_SW: case GSRendererType::OGL_SW: renderer_mode = "(Software mode)"; break; - case GSRendererType::DX9_Null: - case GSRendererType::DX1011_Null: - case GSRendererType::Null_Null: + case GSRendererType::Null: renderer_mode = "(Null mode)"; break; case GSRendererType::DX9_OpenCL: case GSRendererType::DX1011_OpenCL: - case GSRendererType::Null_OpenCL: case GSRendererType::OGL_OpenCL: renderer_mode = "(OpenCL)"; break; @@ -242,7 +238,6 @@ static int _GSopen(void** dsp, const char* title, GSRendererType renderer, int t #ifdef _WIN32 case GSRendererType::DX9_HW: case GSRendererType::DX9_SW: - case GSRendererType::DX9_Null: case GSRendererType::DX9_OpenCL: dev = new GSDevice9(); s_renderer_name = " D3D9"; @@ -250,17 +245,13 @@ static int _GSopen(void** dsp, const char* title, GSRendererType renderer, int t break; case GSRendererType::DX1011_HW: case GSRendererType::DX1011_SW: - case GSRendererType::DX1011_Null: case GSRendererType::DX1011_OpenCL: dev = new GSDevice11(); s_renderer_name = " D3D11"; renderer_fullname = "Direct3D11"; break; #endif - case GSRendererType::Null_HW: - case GSRendererType::Null_SW: - case GSRendererType::Null_Null: - case GSRendererType::Null_OpenCL: + case GSRendererType::Null: dev = new GSDeviceNull(); s_renderer_name = " Null"; renderer_fullname = "Null"; @@ -302,20 +293,16 @@ static int _GSopen(void** dsp, const char* title, GSRendererType renderer, int t break; case GSRendererType::DX9_SW: case GSRendererType::DX1011_SW: - case GSRendererType::Null_SW: case GSRendererType::OGL_SW: s_gs = new GSRendererSW(threads); s_renderer_type = " SW"; break; - case GSRendererType::DX9_Null: - case GSRendererType::DX1011_Null: - case GSRendererType::Null_Null: + case GSRendererType::Null: s_gs = new GSRendererNull(); s_renderer_type = " Null"; break; case GSRendererType::DX9_OpenCL: case GSRendererType::DX1011_OpenCL: - case GSRendererType::Null_OpenCL: case GSRendererType::OGL_OpenCL: #ifdef ENABLE_OPENCL s_gs = new GSRendererCL(); diff --git a/plugins/GSdx/GS.h b/plugins/GSdx/GS.h index b1c7fb5bfd..9df86a1d98 100644 --- a/plugins/GSdx/GS.h +++ b/plugins/GSdx/GS.h @@ -219,24 +219,15 @@ enum GS_AFAIL enum class GSRendererType : int8_t { Undefined = -1, - - DX9_HW = 0, - DX9_SW = 1, - DX9_OpenCL = 14, - DX9_Null = 2, - + DX9_HW, + DX9_SW, DX1011_HW = 3, - DX1011_SW = 4, - DX1011_OpenCL = 15, - DX1011_Null = 5, - - Null_HW = 9, - Null_SW = 10, - Null_OpenCL = 16, - Null_Null = 11, - - OGL_HW = 12, - OGL_SW = 13, + DX1011_SW, + Null = 11, + OGL_HW, + OGL_SW, + DX9_OpenCL, + DX1011_OpenCL, OGL_OpenCL = 17, #ifdef _WIN32 diff --git a/plugins/GSdx/GSSettingsDlg.cpp b/plugins/GSdx/GSSettingsDlg.cpp index fc4d2e97b3..63eecbeb58 100644 --- a/plugins/GSdx/GSSettingsDlg.cpp +++ b/plugins/GSdx/GSSettingsDlg.cpp @@ -311,9 +311,14 @@ void GSSettingsDlg::UpdateRenderers() GSRendererType renderer_setting; if (ComboBoxGetSelData(IDC_RENDERER, i)) + { renderer_setting = static_cast(i); + } else - renderer_setting = static_cast(theApp.GetConfig("Renderer", static_cast(GSRendererType::Default))); + { + GSRendererType best_renderer = (level >= D3D_FEATURE_LEVEL_10_0) ? GSRendererType::DX1011_HW : GSRendererType::DX9_HW; + renderer_setting = static_cast(theApp.GetConfig("Renderer", static_cast(best_renderer))); + } GSRendererType renderer_sel = GSRendererType::Default; @@ -323,14 +328,10 @@ void GSSettingsDlg::UpdateRenderers() GSRendererType renderer = static_cast(r.value); - if(renderer == GSRendererType::DX1011_HW || renderer == GSRendererType::DX1011_SW || renderer == GSRendererType::DX1011_Null || renderer == GSRendererType::DX1011_OpenCL) + if(renderer == GSRendererType::DX1011_HW || renderer == GSRendererType::DX1011_SW || renderer == GSRendererType::DX1011_OpenCL) { if(level < D3D_FEATURE_LEVEL_10_0) continue; -#if 0 - // This code is disabled so the renderer name doesn't get messed with. - // Just call it Direct3D11. r.name += (level >= D3D_FEATURE_LEVEL_11_0 ? "11" : "10"); -#endif } renderers.push_back(r); @@ -358,17 +359,21 @@ void GSSettingsDlg::UpdateControls() if(ComboBoxGetSelData(IDC_RENDERER, i)) { GSRendererType renderer = static_cast(i); + D3D_FEATURE_LEVEL level = GSUtil::CheckDirect3D11Level(); - bool dx9 = renderer == GSRendererType::DX9_HW || renderer == GSRendererType::DX9_SW || renderer == GSRendererType::DX9_Null || renderer == GSRendererType::DX9_OpenCL; - bool dx11 = renderer == GSRendererType::DX1011_HW || renderer == GSRendererType::DX1011_SW || renderer == GSRendererType::DX1011_Null || renderer == GSRendererType::DX1011_OpenCL; + bool dx9 = renderer == GSRendererType::DX9_HW || renderer == GSRendererType::DX9_SW || renderer == GSRendererType::DX9_OpenCL; + bool dx11 = renderer == GSRendererType::DX1011_HW || renderer == GSRendererType::DX1011_SW || renderer == GSRendererType::DX1011_OpenCL; bool ogl = renderer == GSRendererType::OGL_HW || renderer == GSRendererType::OGL_SW || renderer == GSRendererType::OGL_OpenCL; - bool hw = renderer == GSRendererType::DX9_HW || renderer == GSRendererType::DX1011_HW || renderer == GSRendererType::OGL_HW || renderer == GSRendererType::Null_HW; - bool sw = renderer == GSRendererType::DX9_SW || renderer == GSRendererType::DX1011_SW || renderer == GSRendererType::OGL_SW || renderer == GSRendererType::Null_SW; - bool ocl = renderer == GSRendererType::DX9_OpenCL || renderer == GSRendererType::DX1011_OpenCL || renderer == GSRendererType::Null_OpenCL || renderer == GSRendererType::OGL_OpenCL; + bool hw = renderer == GSRendererType::DX9_HW || renderer == GSRendererType::DX1011_HW || renderer == GSRendererType::OGL_HW; + bool sw = renderer == GSRendererType::DX9_SW || renderer == GSRendererType::DX1011_SW || renderer == GSRendererType::OGL_SW; + bool ocl = renderer == GSRendererType::DX9_OpenCL || renderer == GSRendererType::DX1011_OpenCL || renderer == GSRendererType::OGL_OpenCL; + bool null = renderer == GSRendererType::Null; 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 && level >= D3D_FEATURE_LEVEL_11_0) ? SW_SHOW : SW_HIDE); + ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO10), (dx11 && level < D3D_FEATURE_LEVEL_11_0) ? SW_SHOW : SW_HIDE); + ShowWindow(GetDlgItem(m_hWnd, IDC_NULL), null ? SW_SHOW : SW_HIDE); ShowWindow(GetDlgItem(m_hWnd, IDC_LOGOGL), ogl ? SW_SHOW : SW_HIDE); #ifndef ENABLE_OPENCL ShowWindow(GetDlgItem(m_hWnd, IDC_OPENCL_DEVICE), SW_HIDE); @@ -613,12 +618,15 @@ GSHacksDlg::GSHacksDlg() : void GSHacksDlg::OnInit() { HWND hwnd_renderer = GetDlgItem(GetParent(m_hWnd), IDC_RENDERER); + HWND hwnd_upscaling = GetDlgItem(GetParent(m_hWnd), IDC_UPSCALE_MULTIPLIER); GSRendererType renderer = static_cast(SendMessage(hwnd_renderer, CB_GETITEMDATA, SendMessage(hwnd_renderer, CB_GETCURSEL, 0, 0), 0)); + unsigned short upscaling_multiplier = static_cast(SendMessage(hwnd_upscaling, CB_GETITEMDATA, SendMessage(hwnd_upscaling, CB_GETCURSEL, 0, 0), 0)); + unsigned short cb = 0; + // It can only be accessed with a HW renderer, so this is sufficient. bool dx9 = renderer == GSRendererType::DX9_HW; - // bool dx11 = renderer == GSRendererType::DX1011_HW; bool ogl = renderer == GSRendererType::OGL_HW; - unsigned short cb = 0; + bool native = upscaling_multiplier == 1; if(dx9) for(unsigned short i = 0; i < 17; i++) { @@ -678,6 +686,13 @@ void GSHacksDlg::OnInit() ShowWindow(GetDlgItem(m_hWnd, IDC_SAFE_FBMASK), ogl ? SW_SHOW : SW_HIDE); EnableWindow(GetDlgItem(m_hWnd, IDC_MSAACB), !ogl); EnableWindow(GetDlgItem(m_hWnd, IDC_MSAA_TEXT), !ogl); + EnableWindow(GetDlgItem(m_hWnd, IDC_SPRITEHACK), !native); + EnableWindow(GetDlgItem(m_hWnd, IDC_WILDHACK), !native); + EnableWindow(GetDlgItem(m_hWnd, IDC_OFFSETHACK), !native); + EnableWindow(GetDlgItem(m_hWnd, IDC_ALIGN_SPRITE), !native); + EnableWindow(GetDlgItem(m_hWnd, IDC_ROUND_SPRITE), !native); + EnableWindow(GetDlgItem(m_hWnd, IDC_SPRITEHACK_TEXT), !native); + EnableWindow(GetDlgItem(m_hWnd, IDC_ROUND_SPRITE_TEXT), !native); AddTooltip(IDC_SKIPDRAWHACKEDIT); AddTooltip(IDC_SKIPDRAWHACK); diff --git a/plugins/GSdx/GSdx.cpp b/plugins/GSdx/GSdx.cpp index 4532595e89..6be615ded0 100644 --- a/plugins/GSdx/GSdx.cpp +++ b/plugins/GSdx/GSdx.cpp @@ -22,6 +22,7 @@ #include "stdafx.h" #include "GSdx.h" #include "GS.h" +#include "GPU.h" static void* s_hModule; @@ -129,33 +130,25 @@ GSdxApp::GSdxApp() m_section = "Settings"; #ifdef _WIN32 + m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX9_HW), "Direct3D9", "Hardware")); + m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX1011_HW), "Direct3D", "Hardware")); m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::OGL_HW), "OpenGL", "Hardware")); - m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX1011_HW), "Direct3D11", "Hardware")); - m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX9_HW), "Direct3D9", "Hardware")); - + m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX9_SW), "Direct3D9", "Software")); + m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX1011_SW), "Direct3D", "Software")); m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::OGL_SW), "OpenGL", "Software")); - m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX1011_SW), "Direct3D11", "Software")); - m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX9_SW), "Direct3D9", "Software")); - -#ifdef _DEBUG - m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX9_Null), "Direct3D9", "Null")); - m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX1011_Null), "Direct3D11", "Null")); - m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::Null_SW), "Null", "Software")); -#endif #else // Linux m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::OGL_HW), "OpenGL", "Hardware")); m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::OGL_SW), "OpenGL", "Software")); #endif // The null renderer goes third, it has use for benchmarking purposes in a release build - m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::Null_Null), "None", "Core Benchmark")); + m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::Null), "None", "Core Benchmark")); #ifdef ENABLE_OPENCL // OpenCL stuff goes last // FIXME openCL isn't attached to a device (could be impacted by the window management stuff however) m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX9_OpenCL), "Direct3D9", "OpenCL")); m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX1011_OpenCL), "Direct3D11", "OpenCL")); - m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::Null_OpenCL), "Null", "OpenCL")); m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::OGL_OpenCL), "OpenGL", "OpenCL")); #endif @@ -220,11 +213,9 @@ GSdxApp::GSdxApp() m_gs_tv_shaders.push_back(GSSetting(3, "Triangular filter", "")); m_gs_tv_shaders.push_back(GSSetting(4, "Wave filter", "")); - m_gpu_renderers.push_back(GSSetting(0, "Direct3D9 (Software)", "")); - m_gpu_renderers.push_back(GSSetting(1, "Direct3D11 (Software)", "")); - m_gpu_renderers.push_back(GSSetting(2, "SDL 1.3 (Software)", "")); - m_gpu_renderers.push_back(GSSetting(3, "Null (Software)", "")); - //m_gpu_renderers.push_back(GSSetting(4, "Null (Null)", "")); + m_gpu_renderers.push_back(GSSetting(static_cast(GPURendererType::D3D9_SW), "Direct3D9", "Software")); + m_gpu_renderers.push_back(GSSetting(static_cast(GPURendererType::D3D11_SW), "Direct3D11", "Software")); + m_gpu_renderers.push_back(GSSetting(static_cast(GPURendererType::NULL_Renderer), "Null", "")); m_gpu_filter.push_back(GSSetting(0, "Nearest", "")); m_gpu_filter.push_back(GSSetting(1, "Bilinear (polygons only)", "")); diff --git a/plugins/GSdx/GSdx.rc b/plugins/GSdx/GSdx.rc index eb1f09d72b..d8ecf484de 100644 --- a/plugins/GSdx/GSdx.rc +++ b/plugins/GSdx/GSdx.rc @@ -80,9 +80,17 @@ IDR_TFX_CL RCDATA "res\\tfx.cl" // Bitmap // +// GSDX logos for PCSX2 IDB_LOGO9 BITMAP "res\\logo9.bmp" IDB_LOGO10 BITMAP "res\\logo10.bmp" +IDB_LOGO11 BITMAP "res\\logo11.bmp" IDB_LOGOGL BITMAP "res\\logo-ogl.bmp" +IDB_NULL BITMAP "res\\logo-null.bmp" + +// GSDX logos for PS1 Emulators +IDB_PSX_LOGO9 BITMAP "res\\psx-logo9.bmp" +IDB_PSX_LOGO11 BITMAP "res\\psx-logo11.bmp" +IDB_PSX_NULL BITMAP "res\\psx-logo-null.bmp" ///////////////////////////////////////////////////////////////////////////// // @@ -115,8 +123,8 @@ BEGIN CONTROL "",IDC_TCOFFSETY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,135,162,11,14 RTEXT "TC Offset Y:",IDC_STATIC,36,165,48,8 COMBOBOX IDC_ROUND_SPRITE,88,109,58,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Round Sprite:",IDC_STATIC,39,111,45,8 - RTEXT "Sprite:",IDC_STATIC,62,127,22,8 + RTEXT "Round Sprite:",IDC_ROUND_SPRITE_TEXT,39,111,45,8 + RTEXT "Sprite:",IDC_SPRITEHACK_TEXT,62,127,22,8 COMBOBOX IDC_SPRITEHACK,88,125,58,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -173,7 +181,9 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Settings..." FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL IDB_LOGO9,IDC_LOGO9,"Static",SS_BITMAP,7,7,175,44 + CONTROL IDB_PSX_LOGO9,IDC_PSX_LOGO9,"Static",SS_BITMAP,7,7,175,42 + CONTROL IDB_PSX_LOGO11,IDC_PSX_LOGO11,"Static",SS_BITMAP,7,7,175,42 + CONTROL IDB_PSX_NULL,IDC_PSX_NULL,"Static",SS_BITMAP,7,7,175,42 LTEXT "Resolution:",IDC_STATIC,7,59,37,8 COMBOBOX IDC_RESOLUTION,80,57,102,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Renderer:",IDC_STATIC,7,74,34,8 @@ -189,7 +199,6 @@ BEGIN CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,99,161,11,14 DEFPUSHBUTTON "OK",IDOK,43,178,50,14 PUSHBUTTON "Cancel",IDCANCEL,96,178,50,14 - CONTROL IDB_LOGO10,IDC_LOGO11,"Static",SS_BITMAP,7,7,173,42 LTEXT "Internal Resolution:",IDC_STATIC,7,135,64,8 COMBOBOX IDC_SCALE,80,132,102,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Windowed",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,129,157,49,10 @@ -200,9 +209,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "GSdx Settings" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL IDB_LOGO10,IDC_LOGO11,"Static",SS_BITMAP | SS_REALSIZECONTROL,35,6,173,42 - CONTROL IDB_LOGO9,IDC_LOGO9,"Static",SS_BITMAP | SS_REALSIZECONTROL,34,6,175,44 - CONTROL IDB_LOGOGL,IDC_LOGOGL,"Static",SS_BITMAP | SS_REALSIZECONTROL,34,6,175,44 + CONTROL IDB_LOGO9,IDC_LOGO9,"Static",SS_BITMAP | SS_REALSIZECONTROL,6,6,230,44 + CONTROL IDB_LOGO10,IDC_LOGO10,"Static",SS_BITMAP | SS_REALSIZECONTROL,6,6,230,44 + CONTROL IDB_LOGO11,IDC_LOGO11,"Static",SS_BITMAP | SS_REALSIZECONTROL,6,6,230,44 + CONTROL IDB_LOGOGL,IDC_LOGOGL,"Static",SS_BITMAP | SS_REALSIZECONTROL,6,6,230,44 + CONTROL IDB_NULL,IDC_NULL,"Static",SS_BITMAP | SS_REALSIZECONTROL,6,6,230,44 LTEXT "Adapter:",IDC_STATIC,6,57,30,8 COMBOBOX IDC_ADAPTER,71,55,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Renderer:",IDC_STATIC,6,72,34,8 diff --git a/plugins/GSdx/GSdx.vcxproj b/plugins/GSdx/GSdx.vcxproj index e2b87b7e3b..103182df49 100644 --- a/plugins/GSdx/GSdx.vcxproj +++ b/plugins/GSdx/GSdx.vcxproj @@ -947,7 +947,12 @@ + + + + + diff --git a/plugins/GSdx/GSdx.vcxproj.filters b/plugins/GSdx/GSdx.vcxproj.filters index f2039672c2..4a4f06bdc7 100644 --- a/plugins/GSdx/GSdx.vcxproj.filters +++ b/plugins/GSdx/GSdx.vcxproj.filters @@ -609,5 +609,20 @@ Resource Files + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + diff --git a/plugins/GSdx/res/logo-null.bmp b/plugins/GSdx/res/logo-null.bmp new file mode 100644 index 0000000000..ffde4d0e30 Binary files /dev/null and b/plugins/GSdx/res/logo-null.bmp differ diff --git a/plugins/GSdx/res/logo-ogl.bmp b/plugins/GSdx/res/logo-ogl.bmp index 03b077f322..8dcea16b29 100644 Binary files a/plugins/GSdx/res/logo-ogl.bmp and b/plugins/GSdx/res/logo-ogl.bmp differ diff --git a/plugins/GSdx/res/logo10.bmp b/plugins/GSdx/res/logo10.bmp index 25f6b177c7..b770a874cb 100644 Binary files a/plugins/GSdx/res/logo10.bmp and b/plugins/GSdx/res/logo10.bmp differ diff --git a/plugins/GSdx/res/logo11.bmp b/plugins/GSdx/res/logo11.bmp new file mode 100644 index 0000000000..a33c2a5ca6 Binary files /dev/null and b/plugins/GSdx/res/logo11.bmp differ diff --git a/plugins/GSdx/res/logo9.bmp b/plugins/GSdx/res/logo9.bmp index 24cfdbeea8..a84d3a3a90 100644 Binary files a/plugins/GSdx/res/logo9.bmp and b/plugins/GSdx/res/logo9.bmp differ diff --git a/plugins/GSdx/res/psx-logo-null.bmp b/plugins/GSdx/res/psx-logo-null.bmp new file mode 100644 index 0000000000..6aedfd732d Binary files /dev/null and b/plugins/GSdx/res/psx-logo-null.bmp differ diff --git a/plugins/GSdx/res/psx-logo11.bmp b/plugins/GSdx/res/psx-logo11.bmp new file mode 100644 index 0000000000..a50b2faba4 Binary files /dev/null and b/plugins/GSdx/res/psx-logo11.bmp differ diff --git a/plugins/GSdx/res/psx-logo9.bmp b/plugins/GSdx/res/psx-logo9.bmp new file mode 100644 index 0000000000..95f0c71d0a Binary files /dev/null and b/plugins/GSdx/res/psx-logo9.bmp differ diff --git a/plugins/GSdx/resource.h b/plugins/GSdx/resource.h index 19e54c8d19..361006ad5e 100644 --- a/plugins/GSdx/resource.h +++ b/plugins/GSdx/resource.h @@ -21,76 +21,88 @@ #define IDD_CONFIG 2016 #define IDB_LOGO9 2017 #define IDB_LOGO10 2018 -#define IDB_LOGOGL 2019 -#define IDC_FBA 2020 -#define IDC_LOGO9 2021 -#define IDC_LOGO11 2022 -#define IDC_LOGOGL 2023 -#define IDD_CAPTURE 2024 -#define IDD_GPUCONFIG 2025 -#define IDC_RENDERER 2026 -#define IDC_INTERLACE 2027 -#define IDC_ASPECTRATIO 2028 -#define IDC_ALPHAHACK 2029 -#define IDC_SCALE 2030 -#define IDC_UPSCALE_MULTIPLIER 2031 -#define IDC_BROWSE 2032 -#define IDC_OFFSETHACK 2033 -#define IDC_FILENAME 2034 -#define IDC_SKIPDRAWHACK 2035 -#define IDC_WIDTH 2036 -#define IDC_HEIGHT 2037 -#define IDC_CONFIGURE 2038 -#define IDC_ACCURATE_BLEND_UNIT_TEXT 2039 -#define IDC_WINDOWED 2040 -#define IDC_SKIPDRAWHACKEDIT 2041 -#define IDC_SPRITEHACK 2042 -#define IDC_SATURATION_SLIDER 2043 -#define IDC_BRIGHTNESS_SLIDER 2044 -#define IDC_CONTRAST_SLIDER 2045 -#define IDC_SHADEBUTTON 2046 -#define IDC_SHADEBOOST 2047 -#define IDC_HACKS_ENABLED 2048 -#define IDC_SATURATION_TEXT 2049 -#define IDC_BRIGHTNESS_TEXT 2050 -#define IDC_CONTRAST_TEXT 2051 -#define IDC_MSAACB 2052 -#define IDC_MSAA_TEXT 2053 -#define IDC_HACKSBUTTON 2054 -#define IDC_WILDHACK 2055 -#define IDC_CHECK_DISABLE_ALL_HACKS 2056 -#define IDC_ALPHASTENCIL 2057 -#define IDC_ADAPTER 2058 -#define IDC_TCOFFSETX 2059 -#define IDC_TCOFFSETX2 2060 -#define IDC_TCOFFSETY 2061 -#define IDC_TCOFFSETY2 2062 -#define IDC_FXAA 2063 -#define IDC_SHADER_FX 2064 -#define IDC_AFCOMBO_TEXT 2065 -#define IDC_AFCOMBO 2066 -#define IDC_OPENCL_DEVICE 2067 -#define IDC_OPENCL_TEXT 2068 -#define IDC_ACCURATE_BLEND_UNIT 2069 -#define IDC_ACCURATE_DATE 2070 -#define IDC_ROUND_SPRITE 2071 -#define IDC_ALIGN_SPRITE 2072 -#define IDC_CRC_LEVEL 2073 -#define IDC_CRC_LEVEL_TEXT 2074 -#define IDC_TC_DEPTH 2075 -#define IDC_COLORSPACE 2076 -#define IDC_SHADER_FX_EDIT 2077 -#define IDC_SHADER_FX_CONF_EDIT 2078 -#define IDC_SHADER_FX_BUTTON 2079 -#define IDC_SHADER_FX_CONF_BUTTON 2080 -#define IDC_SHADER_FX_TEXT 2081 -#define IDC_SHADER_FX_CONF_TEXT 2082 -#define IDC_CUSTOM_TEXT 2083 -#define IDC_UPSCALE_MULTIPLIER_TEXT 2084 -#define IDC_MIPMAP 2085 -#define IDC_PRELOAD_GS 2086 -#define IDC_TVSHADER 2087 -#define IDC_SAFE_FBMASK 2088 +#define IDB_LOGO11 2019 +#define IDB_LOGOGL 2020 +#define IDB_NULL 2021 +#define IDB_PSX_LOGO9 2022 +#define IDB_PSX_LOGO11 2023 +#define IDB_PSX_NULL 2024 +#define IDC_FBA 2025 +#define IDC_LOGO9 2026 +#define IDC_LOGO10 2027 +#define IDC_LOGO11 2028 +#define IDC_LOGOGL 2029 +#define IDC_NULL 2030 +#define IDC_PSX_LOGO9 2031 +#define IDC_PSX_LOGO11 2032 +#define IDC_PSX_NULL 2033 +#define IDD_CAPTURE 2034 +#define IDD_GPUCONFIG 2035 +#define IDC_RENDERER 2036 +#define IDC_INTERLACE 2037 +#define IDC_ASPECTRATIO 2038 +#define IDC_ALPHAHACK 2039 +#define IDC_SCALE 2040 +#define IDC_UPSCALE_MULTIPLIER 2041 +#define IDC_BROWSE 2042 +#define IDC_OFFSETHACK 2043 +#define IDC_FILENAME 2044 +#define IDC_SKIPDRAWHACK 2045 +#define IDC_WIDTH 2046 +#define IDC_HEIGHT 2047 +#define IDC_CONFIGURE 2048 +#define IDC_ACCURATE_BLEND_UNIT_TEXT 2049 +#define IDC_WINDOWED 2050 +#define IDC_SKIPDRAWHACKEDIT 2051 +#define IDC_SPRITEHACK 2052 +#define IDC_SPRITEHACK_TEXT 2053 +#define IDC_SATURATION_SLIDER 2054 +#define IDC_BRIGHTNESS_SLIDER 2055 +#define IDC_CONTRAST_SLIDER 2056 +#define IDC_SHADEBUTTON 2057 +#define IDC_SHADEBOOST 2058 +#define IDC_HACKS_ENABLED 2059 +#define IDC_SATURATION_TEXT 2060 +#define IDC_BRIGHTNESS_TEXT 2061 +#define IDC_CONTRAST_TEXT 2062 +#define IDC_MSAACB 2063 +#define IDC_MSAA_TEXT 2064 +#define IDC_HACKSBUTTON 2065 +#define IDC_WILDHACK 2066 +#define IDC_CHECK_DISABLE_ALL_HACKS 2067 +#define IDC_ALPHASTENCIL 2068 +#define IDC_ADAPTER 2069 +#define IDC_TCOFFSETX 2070 +#define IDC_TCOFFSETX2 2071 +#define IDC_TCOFFSETY 2072 +#define IDC_TCOFFSETY2 2073 +#define IDC_FXAA 2074 +#define IDC_SHADER_FX 2075 +#define IDC_AFCOMBO_TEXT 2076 +#define IDC_AFCOMBO 2077 +#define IDC_OPENCL_DEVICE 2078 +#define IDC_OPENCL_TEXT 2079 +#define IDC_ACCURATE_BLEND_UNIT 2080 +#define IDC_ACCURATE_DATE 2081 +#define IDC_ROUND_SPRITE 2082 +#define IDC_ROUND_SPRITE_TEXT 2083 +#define IDC_ALIGN_SPRITE 2084 +#define IDC_CRC_LEVEL 2085 +#define IDC_CRC_LEVEL_TEXT 2086 +#define IDC_TC_DEPTH 2087 +#define IDC_COLORSPACE 2088 +#define IDC_SHADER_FX_EDIT 2089 +#define IDC_SHADER_FX_CONF_EDIT 2090 +#define IDC_SHADER_FX_BUTTON 2091 +#define IDC_SHADER_FX_CONF_BUTTON 2092 +#define IDC_SHADER_FX_TEXT 2093 +#define IDC_SHADER_FX_CONF_TEXT 2094 +#define IDC_CUSTOM_TEXT 2095 +#define IDC_UPSCALE_MULTIPLIER_TEXT 2096 +#define IDC_MIPMAP 2097 +#define IDC_PRELOAD_GS 2098 +#define IDC_TVSHADER 2099 +#define IDC_SAFE_FBMASK 2100 #define IDR_CONVERT_FX 10000 #define IDR_TFX_FX 10001 #define IDR_MERGE_FX 10002 @@ -109,7 +121,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 10013 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 2091 +#define _APS_NEXT_CONTROL_VALUE 2101 #define _APS_NEXT_SYMED_VALUE 5000 #endif #endif