diff --git a/plugins/GSdx/GS.cpp b/plugins/GSdx/GS.cpp index e64a0ff7a2..e78a678905 100644 --- a/plugins/GSdx/GS.cpp +++ b/plugins/GSdx/GS.cpp @@ -319,10 +319,10 @@ static int _GSopen(void** dsp, const char* title, GSRendererType renderer, int t case GSRendererType::DX9_SW: case GSRendererType::DX1011_SW: case GSRendererType::OGL_SW: - renderer_mode = "(Software mode)"; + renderer_mode = "(Software renderer)"; break; case GSRendererType::Null: - renderer_mode = "(Null mode)"; + renderer_mode = "(Null renderer)"; break; case GSRendererType::DX9_OpenCL: case GSRendererType::DX1011_OpenCL: @@ -330,7 +330,7 @@ static int _GSopen(void** dsp, const char* title, GSRendererType renderer, int t renderer_mode = "(OpenCL)"; break; default: - renderer_mode = "(Hardware mode)"; + renderer_mode = "(Hardware renderer)"; break; } @@ -343,14 +343,14 @@ static int _GSopen(void** dsp, const char* title, GSRendererType renderer, int t case GSRendererType::DX9_OpenCL: dev = new GSDevice9(); s_renderer_name = " D3D9"; - renderer_fullname = "Direct3D9"; + renderer_fullname = "Direct3D 9"; break; case GSRendererType::DX1011_HW: case GSRendererType::DX1011_SW: case GSRendererType::DX1011_OpenCL: dev = new GSDevice11(); s_renderer_name = " D3D11"; - renderer_fullname = "Direct3D11"; + renderer_fullname = "Direct3D 11"; break; #endif case GSRendererType::Null: diff --git a/plugins/GSdx/GSSetting.cpp b/plugins/GSdx/GSSetting.cpp index 13b54997cc..f14534609c 100644 --- a/plugins/GSdx/GSSetting.cpp +++ b/plugins/GSdx/GSSetting.cpp @@ -149,6 +149,12 @@ const char* dialog_message(int ID, bool* updateText) { case IDC_MEMORY_WRAPPING: return "Emulates GS memory wrapping accurately. This fixes issues where part of the image is cut-off by block shaped sections such as the FMVs in Wallace & Gromit: The Curse of the Were-Rabbit and Thrillville.\n" "Note: This hack can have a small impact on performance."; + case IDC_GEOMETRY_SHADER_OVERRIDE: + return "Allows the GPU instead of just the CPU to transform lines into sprites. This reduces CPU load and bandwidth requirement, but it is heavier on the GPU.\n" + "Automatic detection is recommended.\nNote: This option is only supported by GPUs which support at least Direct3D 10."; + case IDC_IMAGE_LOAD_STORE: + return "Allows advanced atomic operations to speed up Accurate Date. Only disable this if using Accurate Date causes (GPU driver) issues.\n" + "Note: This option is only supported by GPUs which support at least Direct3D 11."; #ifdef _WIN32 // DX9 only case IDC_FBA: diff --git a/plugins/GSdx/GSSetting.h b/plugins/GSdx/GSSetting.h index ae3d4f2793..eaa7283298 100644 --- a/plugins/GSdx/GSSetting.h +++ b/plugins/GSdx/GSSetting.h @@ -80,6 +80,8 @@ enum { IDC_AUTO_FLUSH, IDC_UNSCALE_POINT_LINE, IDC_MEMORY_WRAPPING, + IDC_GEOMETRY_SHADER_OVERRIDE, + IDC_IMAGE_LOAD_STORE, IDC_OSD_LOG, IDC_OSD_MONITOR, IDC_OSD_MAX_LOG, diff --git a/plugins/GSdx/GSSettingsDlg.cpp b/plugins/GSdx/GSSettingsDlg.cpp index 0bef306927..5ef2d195bf 100644 --- a/plugins/GSdx/GSSettingsDlg.cpp +++ b/plugins/GSdx/GSSettingsDlg.cpp @@ -692,6 +692,8 @@ void GSHacksDlg::OnInit() ComboBoxInit(IDC_OFFSETHACK, theApp.m_gs_offset_hack, theApp.GetConfigI("UserHacks_HalfPixelOffset")); ComboBoxInit(IDC_ROUND_SPRITE, theApp.m_gs_hack, theApp.GetConfigI("UserHacks_round_sprite_offset")); ComboBoxInit(IDC_SPRITEHACK, theApp.m_gs_hack, theApp.GetConfigI("UserHacks_SpriteHack")); + ComboBoxInit(IDC_GEOMETRY_SHADER_OVERRIDE, theApp.m_gs_gl_ext, theApp.GetConfigI("override_geometry_shader")); + ComboBoxInit(IDC_IMAGE_LOAD_STORE, theApp.m_gs_gl_ext, theApp.GetConfigI("override_GL_ARB_shader_image_load_store")); SendMessage(GetDlgItem(m_hWnd, IDC_SKIPDRAWHACK), UDM_SETRANGE, 0, MAKELPARAM(1000, 0)); SendMessage(GetDlgItem(m_hWnd, IDC_SKIPDRAWHACK), UDM_SETPOS, 0, MAKELPARAM(theApp.GetConfigI("UserHacks_SkipDraw"), 0)); @@ -702,16 +704,19 @@ void GSHacksDlg::OnInit() SendMessage(GetDlgItem(m_hWnd, IDC_TCOFFSETY), UDM_SETRANGE, 0, MAKELPARAM(10000, 0)); SendMessage(GetDlgItem(m_hWnd, IDC_TCOFFSETY), UDM_SETPOS, 0, MAKELPARAM((theApp.GetConfigI("UserHacks_TCOffset") >> 16) & 0xFFFF, 0)); - ShowWindow(GetDlgItem(m_hWnd, IDC_ALPHASTENCIL), ogl ? SW_HIDE : SW_SHOW); - ShowWindow(GetDlgItem(m_hWnd, IDC_ALPHAHACK), ogl ? SW_HIDE : SW_SHOW); - EnableWindow(GetDlgItem(m_hWnd, IDC_TC_DEPTH), ogl); - EnableWindow(GetDlgItem(m_hWnd, IDC_UNSCALE_POINT_LINE), ogl && !native); + // Direct3D-only hacks: + EnableWindow(GetDlgItem(m_hWnd, IDC_ALPHASTENCIL), !ogl); + EnableWindow(GetDlgItem(m_hWnd, IDC_ALPHAHACK), !ogl); EnableWindow(GetDlgItem(m_hWnd, IDC_MSAACB), !ogl); EnableWindow(GetDlgItem(m_hWnd, IDC_MSAA_TEXT), !ogl); + + // OpenGL-only hacks: + EnableWindow(GetDlgItem(m_hWnd, IDC_TC_DEPTH), ogl); + EnableWindow(GetDlgItem(m_hWnd, IDC_UNSCALE_POINT_LINE), ogl && !native); + + // Upscaling hacks: 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_OFFSETHACK_TEXT), !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); @@ -719,6 +724,12 @@ void GSHacksDlg::OnInit() EnableWindow(GetDlgItem(m_hWnd, IDC_OFFSETHACK_TEXT), !native); EnableWindow(GetDlgItem(m_hWnd, IDC_OFFSETHACK), !native); + // OpenGL Very Advanced Custom Settings: + EnableWindow(GetDlgItem(m_hWnd, IDC_GEOMETRY_SHADER_OVERRIDE), ogl); + EnableWindow(GetDlgItem(m_hWnd, IDC_GEOMETRY_SHADER_TEXT), ogl); + EnableWindow(GetDlgItem(m_hWnd, IDC_IMAGE_LOAD_STORE), ogl); + EnableWindow(GetDlgItem(m_hWnd, IDC_IMAGE_LOAD_STORE_TEXT), ogl); + AddTooltip(IDC_SKIPDRAWHACKEDIT); AddTooltip(IDC_SKIPDRAWHACK); AddTooltip(IDC_ALPHAHACK); @@ -739,6 +750,8 @@ void GSHacksDlg::OnInit() AddTooltip(IDC_AUTO_FLUSH); AddTooltip(IDC_UNSCALE_POINT_LINE); AddTooltip(IDC_MEMORY_WRAPPING); + AddTooltip(IDC_GEOMETRY_SHADER_OVERRIDE); + AddTooltip(IDC_IMAGE_LOAD_STORE); } void GSHacksDlg::UpdateControls() @@ -769,6 +782,14 @@ bool GSHacksDlg::OnMessage(UINT message, WPARAM wParam, LPARAM lParam) { theApp.SetConfig("UserHacks_HalfPixelOffset", (int)data); } + if (ComboBoxGetSelData(IDC_GEOMETRY_SHADER_OVERRIDE, data)) + { + theApp.SetConfig("override_geometry_shader", (int)data); + } + if (ComboBoxGetSelData(IDC_IMAGE_LOAD_STORE, data)) + { + theApp.SetConfig("override_GL_ARB_shader_image_load_store", (int)data); + } theApp.SetConfig("UserHacks_MSAA", cb2msaa[(int)SendMessage(GetDlgItem(m_hWnd, IDC_MSAACB), CB_GETCURSEL, 0, 0)]); theApp.SetConfig("UserHacks_AlphaHack", (int)IsDlgButtonChecked(m_hWnd, IDC_ALPHAHACK)); theApp.SetConfig("UserHacks_SkipDraw", (int)SendMessage(GetDlgItem(m_hWnd, IDC_SKIPDRAWHACK), UDM_GETPOS, 0, 0)); diff --git a/plugins/GSdx/GSdx.cpp b/plugins/GSdx/GSdx.cpp index dbe79019d6..ca90e7f6d0 100644 --- a/plugins/GSdx/GSdx.cpp +++ b/plugins/GSdx/GSdx.cpp @@ -149,11 +149,11 @@ void GSdxApp::Init() 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::DX9_HW), "Direct3D 9", "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::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::DX9_SW), "Direct3D 9", "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")); #else // Linux m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::OGL_HW), "OpenGL", "Hardware")); @@ -167,8 +167,8 @@ void GSdxApp::Init() // OpenCL stuff goes last // FIXME openCL isn't attached to a device (could be impacted by the window management stuff however) #ifdef _WIN32 - 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::DX9_OpenCL), "Direct3D 9", "OpenCL")); + m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX1011_OpenCL), "Direct3D 11", "OpenCL")); #endif m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::OGL_OpenCL), "OpenGL", "OpenCL")); #endif @@ -227,7 +227,7 @@ void GSdxApp::Init() m_gs_hw_mipmapping.push_back(GSSetting(0, "Off", "")); m_gs_hw_mipmapping.push_back(GSSetting(1, "Basic", "Fast")); - m_gs_hw_mipmapping.push_back(GSSetting(2, "Full", "Slow")); + m_gs_hw_mipmapping.push_back(GSSetting(2, "Full", "Very Slow - Not Recommended)")); m_gs_crc_level = { GSSetting(CRCHackLevel::Automatic, "Automatic", "Default"), @@ -251,8 +251,8 @@ void GSdxApp::Init() 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(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::D3D9_SW), "Direct3D 9", "Software")); + m_gpu_renderers.push_back(GSSetting(static_cast(GPURendererType::D3D11_SW), "Direct3D 11", "Software")); m_gpu_renderers.push_back(GSSetting(static_cast(GPURendererType::NULL_Renderer), "Null", "")); m_gpu_filter.push_back(GSSetting(0, "Nearest", "")); diff --git a/plugins/GSdx/GSdx.rc b/plugins/GSdx/GSdx.rc index ae2d16c644..c741c989da 100644 --- a/plugins/GSdx/GSdx.rc +++ b/plugins/GSdx/GSdx.rc @@ -111,40 +111,48 @@ IDB_PSX_NULL BITMAP "res\\psx-logo-null.bmp" // Dialog // -IDD_HACKS DIALOGEX 0, 0, 218, 225 +IDD_HACKS DIALOGEX 0, 0, 210, 278 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Hacks Configuration" +CAPTION "Advanced Settings & Hacks" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,56,199,50,14 - DEFPUSHBUTTON "Cancel",IDCANCEL,112,199,50,14 - GROUPBOX "USE AT YOUR OWN RISK!",IDC_STATIC,7,7,205,190,0,WS_EX_TRANSPARENT - CONTROL "Preload Frame Data",IDC_PRELOAD_GS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,77,80,8 - RTEXT "MSAA:",IDC_MSAA_TEXT,62,20,22,8 - RTEXT "Skipdraw:",IDC_STATIC,52,36,32,8 - EDITTEXT IDC_SKIPDRAWHACKEDIT,88,33,116,14,ES_RIGHT | ES_AUTOHSCROLL - CONTROL "",IDC_SKIPDRAWHACK,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,193,34,11,14 - CONTROL "Alpha",IDC_ALPHAHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,103,34,8 - COMBOBOX IDC_OFFSETHACK,88,115,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Half-pixel Offset:",IDC_OFFSETHACK_TEXT,14,118,70,8 - COMBOBOX IDC_MSAACB,88,17,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Wild Arms Offset",IDC_WILDHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,51,70,8 - CONTROL "Unscale Point Line", IDC_UNSCALE_POINT_LINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,64,90,8 - CONTROL "Alpha Stencil",IDC_ALPHASTENCIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,103,57,8 - CONTROL "Align Sprite",IDC_ALIGN_SPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,51,58,8 - CONTROL "Disable Depth Emulation",IDC_TC_DEPTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,64,92,8 - RTEXT "TC Offset X:",IDC_STATIC,40,165,44,8 - EDITTEXT IDC_TCOFFSETX2,88,162,116,14,ES_RIGHT | ES_AUTOHSCROLL - CONTROL "",IDC_TCOFFSETX,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,193,160,11,14 - EDITTEXT IDC_TCOFFSETY2,88,177,116,14,ES_RIGHT | ES_AUTOHSCROLL - CONTROL "",IDC_TCOFFSETY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,193,175,11,14 - COMBOBOX IDC_ROUND_SPRITE,88,131,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Round Sprite:",IDC_ROUND_SPRITE_TEXT,39,133,45,8 - RTEXT "Sprite:",IDC_SPRITEHACK_TEXT,62,148,22,8 - COMBOBOX IDC_SPRITEHACK,88,147,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Fast Texture Invalidation",IDC_FAST_TC_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,77,92,8 - CONTROL "Auto Flush",IDC_AUTO_FLUSH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,90,55,8 - RTEXT "TC Offset Y:",IDC_STATIC,40,183,44,8 + GROUPBOX "USE AT YOUR OWN RISK!",IDC_STATIC,7,7,196,187,0,WS_EX_TRANSPARENT + CONTROL "Align Sprite",IDC_ALIGN_SPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,19,58,8 + CONTROL "Wild Arms Offset",IDC_WILDHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,19,70,8 + CONTROL "Fast Texture Invalidation",IDC_FAST_TC_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,32,92,8 + CONTROL "Preload Frame Data",IDC_PRELOAD_GS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,32,80,8 + CONTROL "Auto Flush",IDC_AUTO_FLUSH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,45,55,8 + CONTROL "Memory Wrapping",IDC_MEMORY_WRAPPING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,45,75,8 + CONTROL "Unscale Point and Line",IDC_UNSCALE_POINT_LINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,58,90,8 + CONTROL "Disable Depth Emulation",IDC_TC_DEPTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,58,92,8 + CONTROL "Alpha",IDC_ALPHAHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,71,34,8 + CONTROL "Alpha Stencil",IDC_ALPHASTENCIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,71,57,8 + RTEXT "MSAA:",IDC_MSAA_TEXT,54,86,22,8 + COMBOBOX IDC_MSAACB,80,83,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Half-pixel Offset:",IDC_OFFSETHACK_TEXT,14,101,62,8 + COMBOBOX IDC_OFFSETHACK,80,98,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Sprite:",IDC_SPRITEHACK_TEXT,54,116,22,8 + COMBOBOX IDC_SPRITEHACK,80,113,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Round Sprite:",IDC_ROUND_SPRITE_TEXT,31,131,45,8 + COMBOBOX IDC_ROUND_SPRITE,80,128,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Skipdraw:",IDC_STATIC,44,146,32,8 + EDITTEXT IDC_SKIPDRAWHACKEDIT,80,143,116,14,ES_RIGHT | ES_AUTOHSCROLL + CONTROL "",IDC_SKIPDRAWHACK,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,105,144,11,14 + RTEXT "TC Offset X:",IDC_STATIC,32,161,44,8 + EDITTEXT IDC_TCOFFSETX2,80,158,116,14,ES_RIGHT | ES_AUTOHSCROLL + CONTROL "",IDC_TCOFFSETX,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,127,156,11,14 + RTEXT "TC Offset Y:",IDC_STATIC,32,176,44,8 + EDITTEXT IDC_TCOFFSETY2,80,173,116,14,ES_RIGHT | ES_AUTOHSCROLL + CONTROL "",IDC_TCOFFSETY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,127,171,11,14 + // OpenGL Advanced Settings: + GROUPBOX "OpenGL Very Advanced Custom Settings",IDC_STATIC,7,200,196,48,0,WS_EX_TRANSPARENT + RTEXT "Geometry Shader:",IDC_GEOMETRY_SHADER_TEXT,14,215,62,8 + COMBOBOX IDC_GEOMETRY_SHADER_OVERRIDE,80,213,97,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Image Load Store:",IDC_IMAGE_LOAD_STORE_TEXT,14,231,62,8 + COMBOBOX IDC_IMAGE_LOAD_STORE,80,228,97,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + // General Settings: + DEFPUSHBUTTON "OK",IDOK,52,258,50,14 + DEFPUSHBUTTON "Cancel",IDCANCEL,108,258,50,14 END IDD_SHADER DIALOGEX 0, 0, 248, 250 @@ -255,6 +263,7 @@ 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 + // General Settings: 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 @@ -264,12 +273,18 @@ BEGIN COMBOBOX IDC_ADAPTER,71,55,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Renderer:",IDC_STATIC,6,72,34,8 COMBOBOX IDC_RENDERER,71,70,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "OpenCL Device:",IDC_OPENCL_TEXT,6,102,53,8 - COMBOBOX IDC_OPENCL_DEVICE,71,100,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Interlacing (F5):",IDC_STATIC,6,87,52,8 COMBOBOX IDC_INTERLACE,71,85,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Hardware Mode Settings",IDC_STATIC,6,116,231,168,BS_CENTER + LTEXT "OpenCL Device:",IDC_OPENCL_TEXT,6,102,53,8 + COMBOBOX IDC_OPENCL_DEVICE,71,100,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Shader Configuration",IDC_SHADEBUTTON,124,339,107,14 + PUSHBUTTON "OSD Configuration",IDC_OSDBUTTON,11,339,107,14 + DEFPUSHBUTTON "OK",IDOK,69,386,50,14 + PUSHBUTTON "Cancel",IDCANCEL,125,386,50,14 + // Hardware Renderer Settings: + GROUPBOX "Hardware Renderer Settings",IDC_STATIC,6,116,231,136,BS_CENTER CONTROL "Allow 8-Bit Textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,128,90,10 + CONTROL "Large Framebuffer",IDC_LARGE_FB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,128,90,10 LTEXT "Internal Resolution:",IDC_UPSCALE_MULTIPLIER_TEXT,22,144,79,8 COMBOBOX IDC_UPSCALE_MULTIPLIER,105,142,127,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Custom Resolution:",IDC_CUSTOM_TEXT,22,160,79,8 @@ -285,26 +300,22 @@ BEGIN COMBOBOX IDC_MIPMAP_HW,105,206,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "CRC Hack Level:",IDC_CRC_LEVEL_TEXT,22,224,79,8 COMBOBOX IDC_CRC_LEVEL,105,222,127,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Enable HW Hacks",IDC_HACKS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,239,71,10 - PUSHBUTTON "Configure Hacks",IDC_HACKSBUTTON,105,237,127,14 + CONTROL "Enable HW Hacks",IDC_HACKS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,223,71,10 + PUSHBUTTON "Advanced Settings and Hacks",IDC_HACKSBUTTON,105,237,127,14 + // OpenGL (Hardware) Settings: CONTROL "Accurate Date",IDC_ACCURATE_DATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,255,72,8 - CONTROL "Large Framebuffer",IDC_LARGE_FB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,128,90,10 LTEXT "Blending Unit Accuracy:",IDC_ACCURATE_BLEND_UNIT_TEXT,22,268,79,10 COMBOBOX IDC_ACCURATE_BLEND_UNIT,105,267,127,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + // Direct3D 9 (Hardware) Settings: CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,255,90,8 CONTROL "Alpha Correction",IDC_FBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,255,74,8 - CONTROL "Mipmapping",IDC_MIPMAP_SW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,320,90,8 - GROUPBOX "Software Mode Settings",IDC_STATIC,6,291,231,40,BS_CENTER + // Software Renderer Settings: + GROUPBOX "Software Renderer Settings",IDC_STATIC,6,291,231,40,BS_CENTER CONTROL "Edge Anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,303,91,10 LTEXT "Rendering threads:",IDC_SWTHREADS_TEXT,124,304,80,8 EDITTEXT IDC_SWTHREADS_EDIT,198,302,34,13,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,221,301,11,14 - PUSHBUTTON "Configure",IDC_SHADEBUTTON,105,339,127,14 - LTEXT "Shader Configuration:",IDC_STATIC,11,343,90,14 - PUSHBUTTON "Configure",IDC_OSDBUTTON,105,356,127,14 - LTEXT "OSD Configuration:",IDC_STATIC,11,359,90,14 - DEFPUSHBUTTON "OK",IDOK,69,385,50,14 - PUSHBUTTON "Cancel",IDCANCEL,125,385,50,14 + CONTROL "Mipmapping",IDC_MIPMAP_SW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,320,90,8 END diff --git a/plugins/GSdx/resource.h b/plugins/GSdx/resource.h index d77cf715ea..3d34733b69 100644 --- a/plugins/GSdx/resource.h +++ b/plugins/GSdx/resource.h @@ -2,127 +2,139 @@ // Microsoft Visual C++ generated include file. // Used by GSdx.rc // -#define IDC_PALTEX 2001 -#define IDC_LOGZ 2002 -#define IDC_CODECS 2003 -#define IDC_RESOLUTION 2004 -#define IDC_RESX_EDIT 2005 -#define IDC_RESY_EDIT 2006 -#define IDC_AA1 2007 -#define IDC_SWTHREADS_TEXT 2008 -#define IDC_SWTHREADS 2009 -#define IDC_SWTHREADS_EDIT 2010 -#define IDC_FILTER_TEXT 2011 -#define IDC_FILTER 2012 -#define IDC_DITHERING 2013 -#define IDC_RESX 2014 -#define IDC_RESY 2015 -#define IDD_CONFIG 2016 -#define IDB_LOGO9 2017 -#define IDB_LOGO10 2018 -#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_OFFSETHACK_TEXT 2044 -#define IDC_FILENAME 2045 -#define IDC_SKIPDRAWHACK 2046 -#define IDC_WIDTH 2047 -#define IDC_HEIGHT 2048 -#define IDC_CONFIGURE 2049 -#define IDC_ACCURATE_BLEND_UNIT_TEXT 2050 -#define IDC_WINDOWED 2051 -#define IDC_SKIPDRAWHACKEDIT 2052 -#define IDC_SPRITEHACK 2053 -#define IDC_SPRITEHACK_TEXT 2054 -#define IDC_SATURATION_SLIDER 2055 -#define IDC_BRIGHTNESS_SLIDER 2056 -#define IDC_CONTRAST_SLIDER 2057 -#define IDC_SHADEBUTTON 2058 -#define IDC_SHADEBOOST 2059 -#define IDC_HACKS_ENABLED 2060 -#define IDC_SATURATION_TEXT 2061 -#define IDC_BRIGHTNESS_TEXT 2062 -#define IDC_CONTRAST_TEXT 2063 -#define IDC_MSAACB 2064 -#define IDC_MSAA_TEXT 2065 -#define IDC_HACKSBUTTON 2066 -#define IDC_WILDHACK 2067 -#define IDC_CHECK_DISABLE_ALL_HACKS 2068 -#define IDC_ALPHASTENCIL 2069 -#define IDC_ADAPTER 2070 -#define IDC_TCOFFSETX 2071 -#define IDC_TCOFFSETX2 2072 -#define IDC_TCOFFSETY 2073 -#define IDC_TCOFFSETY2 2074 -#define IDC_FXAA 2075 -#define IDC_SHADER_FX 2076 -#define IDC_AFCOMBO_TEXT 2077 -#define IDC_AFCOMBO 2078 -#define IDC_OPENCL_DEVICE 2079 -#define IDC_OPENCL_TEXT 2080 -#define IDC_ACCURATE_BLEND_UNIT 2081 -#define IDC_ACCURATE_DATE 2082 -#define IDC_ROUND_SPRITE 2083 -#define IDC_ROUND_SPRITE_TEXT 2084 -#define IDC_ALIGN_SPRITE 2085 -#define IDC_CRC_LEVEL 2086 -#define IDC_CRC_LEVEL_TEXT 2087 -#define IDC_TC_DEPTH 2088 -#define IDC_COLORSPACE 2089 -#define IDC_SHADER_FX_EDIT 2090 -#define IDC_SHADER_FX_CONF_EDIT 2091 -#define IDC_SHADER_FX_BUTTON 2092 -#define IDC_SHADER_FX_CONF_BUTTON 2093 -#define IDC_SHADER_FX_TEXT 2094 -#define IDC_SHADER_FX_CONF_TEXT 2095 -#define IDC_CUSTOM_TEXT 2096 -#define IDC_UPSCALE_MULTIPLIER_TEXT 2097 -#define IDC_MIPMAP_HW 2098 -#define IDC_MIPMAP_HW_TEXT 2099 -#define IDC_MIPMAP_SW 2100 -#define IDC_PRELOAD_GS 2101 -#define IDC_TVSHADER 2102 -#define IDC_FAST_TC_INV 2103 -#define IDC_LARGE_FB 2104 -#define IDC_AUTO_FLUSH 2105 -#define IDC_UNSCALE_POINT_LINE 2106 -#define IDC_OSD_FONT_EDIT 2107 -#define IDC_OSD_FONT_BUTTON 2108 -#define IDC_OSD_SPEED 2109 -#define IDC_OSD_SPEED_EDIT 2110 -#define IDC_OSD_SIZE 2111 -#define IDC_OSD_SIZE_EDIT 2112 -#define IDC_OSD_TRANSPARENCY_SLIDER 2113 -#define IDC_OSD_TRANSPARENCY_TEXT 2114 -#define IDC_OSD_LOG 2115 -#define IDC_OSD_MONITOR 2116 -#define IDC_OSD_INDICATOR 2117 -#define IDC_OSDBUTTON 2118 -#define IDC_OSD_MAX_LOG 2119 -#define IDC_OSD_MAX_LOG_EDIT 2120 -#define IDC_MEMORY_WRAPPING 2121 +// General Dialog: +#define IDD_CONFIG 2001 +#define IDB_NULL 2002 +#define IDB_LOGO9 2003 +#define IDB_LOGO10 2004 +#define IDB_LOGO11 2005 +#define IDB_LOGOGL 2006 +#define IDC_NULL 2007 +#define IDC_LOGO9 2008 +#define IDC_LOGO10 2009 +#define IDC_LOGO11 2010 +#define IDC_LOGOGL 2011 +#define IDC_ADAPTER 2012 +#define IDC_RENDERER 2013 +#define IDC_FILTER_TEXT 2014 +#define IDC_FILTER 2015 +#define IDC_INTERLACE 2016 +#define IDC_OPENCL_DEVICE 2017 +#define IDC_OPENCL_TEXT 2018 +#define IDC_HACKSBUTTON 2019 +#define IDC_OSDBUTTON 2020 +#define IDC_SHADEBUTTON 2021 +#define IDC_CHECK_DISABLE_ALL_HACKS 2022 +// Hardware Renderer Settings: +#define IDC_PALTEX 2030 +#define IDC_LARGE_FB 2031 +#define IDC_UPSCALE_MULTIPLIER 2032 +#define IDC_UPSCALE_MULTIPLIER_TEXT 2033 +#define IDC_CUSTOM_TEXT 2034 +#define IDC_RESX 2035 +#define IDC_RESX_EDIT 2036 +#define IDC_RESY 2037 +#define IDC_RESY_EDIT 2038 +#define IDC_AFCOMBO_TEXT 2039 +#define IDC_AFCOMBO 2040 +#define IDC_MIPMAP_HW 2041 +#define IDC_MIPMAP_HW_TEXT 2042 +#define IDC_CRC_LEVEL 2043 +#define IDC_CRC_LEVEL_TEXT 2044 +#define IDC_HACKS_ENABLED 2045 +#define IDC_ACCURATE_DATE 2046 +#define IDC_ACCURATE_BLEND_UNIT 2047 +#define IDC_ACCURATE_BLEND_UNIT_TEXT 2048 +#define IDC_FBA 2049 +#define IDC_LOGZ 2050 +// Software Renderer Settings: +#define IDC_MIPMAP_SW 2060 +#define IDC_AA1 2061 +#define IDC_SWTHREADS_TEXT 2062 +#define IDC_SWTHREADS 2063 +#define IDC_SWTHREADS_EDIT 2064 +// PSX: +#define IDB_PSX_NULL 2070 +#define IDB_PSX_LOGO9 2071 +#define IDB_PSX_LOGO11 2072 +#define IDC_PSX_NULL 2073 +#define IDC_PSX_LOGO9 2074 +#define IDC_PSX_LOGO11 2075 +#define IDD_GPUCONFIG 2076 +#define IDC_ASPECTRATIO 2077 +#define IDC_DITHERING 2078 +#define IDC_WINDOWED 2079 +#define IDC_RESOLUTION 2080 +#define IDC_SCALE 2081 +// Capture: +#define IDD_CAPTURE 2090 +#define IDC_FILENAME 2091 +#define IDC_CODECS 2092 +#define IDC_BROWSE 2093 +#define IDC_WIDTH 2094 +#define IDC_HEIGHT 2095 +#define IDC_CONFIGURE 2096 +#define IDC_COLORSPACE 2097 +// Hardware Hacks: +#define IDC_WILDHACK 2100 +#define IDC_ALPHAHACK 2101 +#define IDC_OFFSETHACK 2102 +#define IDC_OFFSETHACK_TEXT 2103 +#define IDC_SKIPDRAWHACK 2104 +#define IDC_SKIPDRAWHACKEDIT 2105 +#define IDC_SPRITEHACK 2106 +#define IDC_SPRITEHACK_TEXT 2107 +#define IDC_MSAACB 2108 +#define IDC_MSAA_TEXT 2109 +#define IDC_ALPHASTENCIL 2110 +#define IDC_TCOFFSETX 2111 +#define IDC_TCOFFSETX2 2112 +#define IDC_TCOFFSETY 2113 +#define IDC_TCOFFSETY2 2114 +#define IDC_ROUND_SPRITE 2115 +#define IDC_ROUND_SPRITE_TEXT 2116 +#define IDC_ALIGN_SPRITE 2117 +#define IDC_TC_DEPTH 2118 +#define IDC_PRELOAD_GS 2119 +#define IDC_FAST_TC_INV 2120 +#define IDC_AUTO_FLUSH 2121 +#define IDC_MEMORY_WRAPPING 2122 +// Shader: +#define IDC_SHADEBOOST 2140 +#define IDC_FXAA 2141 +#define IDC_SATURATION_SLIDER 2142 +#define IDC_BRIGHTNESS_SLIDER 2143 +#define IDC_CONTRAST_SLIDER 2144 +#define IDC_SATURATION_TEXT 2145 +#define IDC_BRIGHTNESS_TEXT 2146 +#define IDC_CONTRAST_TEXT 2147 +#define IDC_SHADER_FX 2148 +#define IDC_SHADER_FX_EDIT 2149 +#define IDC_SHADER_FX_CONF_EDIT 2150 +#define IDC_SHADER_FX_BUTTON 2151 +#define IDC_SHADER_FX_CONF_BUTTON 2152 +#define IDC_SHADER_FX_TEXT 2153 +#define IDC_SHADER_FX_CONF_TEXT 2154 +#define IDC_TVSHADER 2155 +// OSD: +#define IDC_OSD_LOG 2170 +#define IDC_OSD_MONITOR 2171 +#define IDC_OSD_INDICATOR 2172 +#define IDC_OSD_FONT_BUTTON 2173 +#define IDC_OSD_FONT_EDIT 2174 +#define IDC_OSD_SPEED 2175 +#define IDC_OSD_SPEED_EDIT 2176 +#define IDC_OSD_SIZE 2177 +#define IDC_OSD_SIZE_EDIT 2178 +#define IDC_OSD_TRANSPARENCY_SLIDER 2179 +#define IDC_OSD_TRANSPARENCY_TEXT 2180 +#define IDC_OSD_MAX_LOG 2181 +#define IDC_OSD_MAX_LOG_EDIT 2182 +// OpenGL Advanced Settings: +#define IDC_GEOMETRY_SHADER_OVERRIDE 2190 +#define IDC_GEOMETRY_SHADER_TEXT 2191 +#define IDC_IMAGE_LOAD_STORE 2192 +#define IDC_IMAGE_LOAD_STORE_TEXT 2193 #define IDR_CONVERT_FX 10000 #define IDR_TFX_FX 10001 #define IDR_MERGE_FX 10002 @@ -142,7 +154,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 10013 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 2122 +#define _APS_NEXT_CONTROL_VALUE 2194 #define _APS_NEXT_SYMED_VALUE 5000 #endif #endif