apply James333 patch to make dx9 plugin use wxwidgets.

some other minor warning fixes. thanks to James333 nice patch :) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5679 8ced0084-cf51-0410-be5f-012b33b47a6e
2026-06-19 01:16:48 -07:00 · 2010-06-13 19:41:07 +00:00
parent a524cecfab
commit 20e3919033
8 changed files with 689 additions and 578 deletions
@@ -276,7 +276,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type)
 		
 		if(color.enablelighting && alpha.enablelighting)
 		{
-			// both have lighting, test if they use the same ligths
+			// both have lighting, test if they use the same lights
            int mask = 0;
 			if(color.lightparams == alpha.lightparams)
 			{
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="Plugin_VideoDX9"
 	ProjectGUID="{636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18}"
 	RootNamespace="Plugin_VideoDX9"
@@ -99,12 +99,12 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../../Externals/Cg;&quot;..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)&quot;"
 				GenerateManifest="false"
+				DelayLoadDLLs="d3dx9_42.dll"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)\$(TargetName).lib"
 				TargetMachine="1"
-				DelayLoadDLLs="d3dx9_42.dll"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -210,6 +210,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\..\Externals\Cg64;&quot;..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)&quot;"
 				GenerateManifest="false"
+				DelayLoadDLLs="d3dx9_42.dll"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"
 				SubSystem="2"
@@ -217,7 +218,6 @@
 				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)\$(TargetName).lib"
 				TargetMachine="17"
-				DelayLoadDLLs="d3dx9_42.dll"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -311,13 +311,13 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../../Externals/Cg;&quot;..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)&quot;"
 				GenerateManifest="false"
+				DelayLoadDLLs="d3dx9d_42.dll"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)\$(TargetName).lib"
 				TargetMachine="1"
-				DelayLoadDLLs="d3dx9d_42.dll"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -410,13 +410,13 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\..\Externals\Cg64;&quot;..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)&quot;"
 				GenerateManifest="false"
+				DelayLoadDLLs="d3dx9d_42.dll"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)\$(TargetName).lib"
 				TargetMachine="17"
-				DelayLoadDLLs="d3dx9d_42.dll"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -520,13 +520,13 @@
 				AdditionalLibraryDirectories="../../../Externals/Cg;&quot;..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)&quot;"
 				GenerateManifest="false"
 				IgnoreDefaultLibraryNames=""
+				DelayLoadDLLs="d3dx9_42.dll"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)\$(TargetName).lib"
 				TargetMachine="1"
-				DelayLoadDLLs="d3dx9_42.dll"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -631,13 +631,13 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\..\Externals\Cg64;&quot;..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)&quot;"
 				GenerateManifest="false"
+				DelayLoadDLLs="d3dx9_42.dll"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="$(PlatformName)\$(ConfigurationName)\$(TargetName).lib"
 				TargetMachine="17"
-				DelayLoadDLLs="d3dx9_42.dll"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -665,19 +665,6 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath=".\Src\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Src\Resource.rc"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="win32"
 			>
@@ -15,6 +15,175 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/

-#pragma once
+#ifndef _DX_DLGSETTINGS_H_
+#define _DX_DLGSETTINGS_H_
+ 
+#include <wx/wx.h>
+#include <wx/dialog.h>
+#include <wx/textctrl.h>
+#include <wx/button.h>
+#include <wx/stattext.h>
+#include <wx/choice.h>
+#include <wx/combobox.h>
+#include <wx/checkbox.h>
+#include <wx/notebook.h>
+#include <wx/panel.h>
+#include <wx/filepicker.h>
+#include <wx/gbsizer.h>

-void DlgSettings_Show(HINSTANCE hInstance, HWND parent);
+class GFXConfigDialogDX : public wxDialog
+{
+	public:
+		GFXConfigDialogDX(wxWindow *parent, wxWindowID id = 1,
+#ifdef DEBUGFAST
+			const wxString &title = wxT("DX (DEBUGFAST) Plugin Configuration"),
+#else
+#ifndef _DEBUG
+			const wxString &title = wxT("DX Plugin Configuration"),
+#else
+			const wxString &title = wxT("DX (DEBUG) Plugin Configuration"),
+#endif
+#endif
+			const wxPoint& pos = wxDefaultPosition,
+			const wxSize& size = wxDefaultSize,
+			long style = wxDEFAULT_DIALOG_STYLE);
+		virtual ~GFXConfigDialogDX();
+		void CreateGUIControls();
+		void CloseClick(wxCommandEvent& WXUNUSED (event));
+
+	private:
+		DECLARE_EVENT_TABLE();
+
+		wxBoxSizer* sGeneral;
+		wxStaticBoxSizer* sbBasic;
+		wxGridBagSizer* sBasic;
+		wxStaticBoxSizer* sbSTC;
+		wxGridBagSizer* sSTC;
+
+		wxBoxSizer* sEnhancements;
+		wxStaticBoxSizer* sbTextureFilter;
+		wxGridBagSizer* sTextureFilter;
+		wxStaticBoxSizer* sbEFBHacks;
+		wxGridBagSizer* sEFBHacks;
+
+		wxBoxSizer* sAdvanced;
+		wxStaticBoxSizer* sbSettings;
+		wxGridBagSizer* sSettings;
+		wxStaticBoxSizer* sbDataDumping;
+		wxGridBagSizer* sDataDumping;
+		wxStaticBoxSizer* sbDebuggingTools;
+		wxGridBagSizer* sDebuggingTools;
+
+		
+		wxButton *m_Close;
+
+		wxNotebook *m_Notebook;
+		wxPanel *m_PageDirect3D;
+		wxPanel *m_PageEnhancements;
+		wxPanel *m_PageAdvanced;
+
+		//Direct3D Tab
+		wxStaticText* m_AdapterText;
+		wxChoice *m_AdapterCB;
+		wxArrayString arrayStringFor_AdapterCB;
+		wxArrayString arrayStringFor_MSAAModeCB;
+		wxCheckBox *m_VSync;
+		wxCheckBox *m_WidescreenHack;
+		wxStaticText* m_staticARText;
+		wxChoice *m_KeepAR;
+		wxStaticText* m_staticMSAAText;
+		wxChoice *m_MSAAModeCB;
+		wxStaticText* m_EFBScaleText;
+		wxChoice *m_EFBScaleMode;
+		wxCheckBox *m_EnableEFBAccess;
+		wxCheckBox *m_SafeTextureCache;
+		wxRadioButton *m_Radio_SafeTextureCache_Fast;
+		wxRadioButton *m_Radio_SafeTextureCache_Normal;
+		wxRadioButton *m_Radio_SafeTextureCache_Safe;
+
+		//Enhancements Tab
+		wxCheckBox *m_ForceFiltering;
+		wxCheckBox *m_MaxAnisotropy;
+		wxCheckBox *m_HiresTextures;
+		wxCheckBox *m_EFBScaledCopy;
+
+		//Advanced Tab
+		wxCheckBox *m_DisableFog;
+		wxCheckBox *m_OverlayFPS;
+		wxCheckBox *m_CopyEFB;
+		wxRadioButton *m_Radio_CopyEFBToRAM;
+		wxRadioButton *m_Radio_CopyEFBToGL;
+		wxCheckBox *m_EnableHotkeys;
+		wxCheckBox *m_WireFrame;
+		wxCheckBox *m_EnableXFB;
+		wxCheckBox *m_EnableRealXFB;
+		wxCheckBox *m_UseNativeMips;
+		wxCheckBox *m_DumpTextures;
+		wxCheckBox *m_DumpFrames;
+		wxCheckBox *m_OverlayStats;
+		wxCheckBox *m_ProjStats;
+		wxCheckBox *m_ShaderErrors;
+		wxCheckBox *m_TexfmtOverlay;
+		wxCheckBox *m_TexfmtCenter;
+
+		enum
+		{
+			ID_CLOSE,
+			ID_ADAPTER,
+			ID_VSYNC,
+			ID_WIDESCREEN_HACK,
+			ID_ASPECT,
+			ID_FULLSCREENRESOLUTION,
+			ID_ANTIALIASMODE,
+			ID_EFBSCALEMODE,
+			ID_EFB_ACCESS_ENABLE,
+			ID_SAFETEXTURECACHE,
+			ID_RADIO_SAFETEXTURECACHE_SAFE,
+			ID_RADIO_SAFETEXTURECACHE_NORMAL,
+			ID_RADIO_SAFETEXTURECACHE_FAST,
+			ID_FORCEFILTERING,
+			ID_FORCEANISOTROPY,
+			ID_LOADHIRESTEXTURES,
+			ID_EFBSCALEDCOPY,
+			ID_DISABLEFOG,
+			ID_OVERLAYFPS,
+			ID_ENABLEEFBCOPY,
+			ID_EFBTORAM,
+			ID_EFBTOTEX,
+			ID_ENABLEHOTKEY,
+			ID_WIREFRAME,
+			ID_ENABLEXFB,
+			ID_ENABLEREALXFB,
+			ID_USENATIVEMIPS,
+			ID_TEXDUMP,
+			ID_DUMPFRAMES,
+			ID_OVERLAYSTATS,
+			ID_PROJSTATS,
+			ID_SHADERERRORS,
+			ID_TEXFMT_OVERLAY,
+			ID_TEXFMT_CENTER,
+			ID_CHECK1,
+			ID_LIST1,
+			ID_DEBUGSTEP,
+			ID_REGISTERS,
+			ID_ENABLEDEBUGGING,
+			ID_REGISTERSELECT,
+			ID_ARTEXT,
+			ID_NOTEBOOK = 1000,
+			ID_DEBUGGER,
+			ID_ABOUT,
+			ID_DIRERCT3D,
+			ID_PAGEENHANCEMENTS,
+			ID_PAGEADVANCED
+		};
+		void InitializeAdapters();
+		void OnClose(wxCloseEvent& event);
+		void InitializeGUIValues();
+		void DirectXSettingsChanged(wxCommandEvent& event);
+		void EnhancementsSettingsChanged(wxCommandEvent& event);
+		void AdvancedSettingsChanged(wxCommandEvent& event);
+		void CloseWindow();
+		void UpdateGUI();
+
+};
+#endif //_DX_DLGSETTINGS_H_
@@ -1118,7 +1118,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight)
 			else 
 			{
 				char msg [255];
-				sprintf(msg, "Dumping Frames to \"%sframedump0.avi\" (%dx%d RGB24)", File::GetUserPath(D_DUMPFRAMES_IDX), s_recordWidth, s_recordHeight);
+				sprintf_s(msg,255, "Dumping Frames to \"%sframedump0.avi\" (%dx%d RGB24)", File::GetUserPath(D_DUMPFRAMES_IDX), s_recordWidth, s_recordHeight);
 				OSD::AddMessage(msg, 2000);
 			}
 		}
@@ -1397,7 +1397,7 @@ void Renderer::SetInterlacingMode()
 void Renderer::SetScreenshot(const char *filename)
 {
 	s_criticalScreenshot.Enter();
-	strcpy(s_sScreenshotName,filename);
+	strcpy_s(s_sScreenshotName,filename);
 	s_bScreenshot = true;
 	s_criticalScreenshot.Leave();
 }
@@ -21,6 +21,13 @@
 #include "LogManager.h"
 #include "debugger/debugger.h"

+#if defined(HAVE_WX) && HAVE_WX
+#include "DlgSettings.h"
+GFXConfigDialogDX *m_ConfigFrame = NULL;
+#endif // HAVE_WX
+
+
+
 #if defined(HAVE_WX) && HAVE_WX
 #include "Debugger/Debugger.h"
 GFXDebuggerDX9 *m_DebuggerFrame = NULL;
@@ -205,8 +212,33 @@ void DllConfig(HWND _hParent)
 	// If not initialized, only init D3D so we can enumerate resolutions.
 	if (!s_PluginInitialized)
 		D3D::Init();
-	HINSTANCE hREd = LoadLibrary(_T("riched20.dll"));
-	DlgSettings_Show(g_hInstance, _hParent);
+	g_Config.Load((std::string(File::GetUserPath(D_CONFIG_IDX)) + "gfx_dx9.ini").c_str());
+	g_Config.GameIniLoad(globals->game_ini);
+	UpdateActiveConfig();
+#if defined(HAVE_WX) && HAVE_WX
+	wxWindow *frame = GetParentedWxWindow(_hParent);
+	m_ConfigFrame = new GFXConfigDialogDX(frame);
+
+	// Prevent user to show more than 1 config window at same time
+#ifdef _WIN32
+	frame->Disable();
+	m_ConfigFrame->CreateGUIControls();
+	m_ConfigFrame->ShowModal();
+	frame->Enable();
+#else
+	m_ConfigFrame->CreateGUIControls();
+	m_ConfigFrame->ShowModal();
+#endif
+
+#ifdef _WIN32
+	frame->SetFocus();
+	frame->SetHWND(NULL);
+#endif
+
+	m_ConfigFrame->Destroy();
+	m_ConfigFrame = NULL;
+	frame->Destroy();
+#endif
 	if (!s_PluginInitialized)
 		D3D::Shutdown();
 }
@@ -341,7 +373,6 @@ void VideoFifo_CheckSwapRequest()
 		{
 			Renderer::Swap(s_beginFieldArgs.xfbAddr, s_beginFieldArgs.field, s_beginFieldArgs.fbWidth, s_beginFieldArgs.fbHeight);
 		}
-
 		Common::AtomicStoreRelease(s_swapRequested, FALSE);
 	}
 }
@@ -1,54 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by Resource.rc
-//
-#define IDD_ABOUT                       102
-#define IDD_SETTINGS                    103
-#define IDD_ENHANCEMENTS                104
-#define IDD_ADVANCED                    105
-#define IDC_ADAPTER                     1001
-#define IDC_ANTIALIASMODE               1002
-#define IDC_ANTIALIASMODE2              1003
-#define IDC_EFBSCALE                    1003
-#define IDC_VSYNC                       1006
-#define IDC_WIDESCREEN_HACK             1010
-#define IDC_SAFE_TEXTURE_CACHE          1011
-#define IDC_EFB_ACCESS_ENABLE           1012
-#define IDC_WIREFRAME                   1013
-#define IDC_DISABLEFOG                  1014
-#define IDC_OVERLAYFPS                  1015
-#define IDC_OVERLAYSTATS                1016
-#define IDC_OVERLAYPROJSTATS            1017
-#define IDC_ENABLEEFBCOPY               1018
-#define IDC_EFBTORAM                    1019
-#define IDC_EFBTOTEX                    1020
-#define IDC_TEXDUMP                     1021
-#define IDC_DUMPFRAMES                  1022
-#define IDC_SHOWSHADERERRORS            1023
-#define IDC_TEXFMT_OVERLAY              1024
-#define IDC_TEXFMT_CENTER               1025
-#define IDC_FORCEFILTERING              1026
-#define IDC_ENABLEXFB                   1026
-#define IDC_FORCEANISOTROPY             1027
-#define IDC_ENABLEREALXFB               1027
-#define IDC_LOADHIRESTEXTURE            1028
-#define IDC_EFBSCALEDCOPY               1029
-#define IDC_OSDHOTKEY                   1030
-#define IDC_ASPECTRATIO                 1040
-#define IDC_SAFE_TEXTURE_CACHE_SAFE     1041
-#define IDC_SAFE_TEXTURE_CACHE_NORMAL   1042
-#define IDC_SAFE_TEXTURE_CACHE_FAST     1043
-#define IDC_DXCHK                       1046
-#define IDC_USENATIVEMIPS               1100
-#define IDC_STATIC                      -1
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        106
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1047
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
@@ -1,198 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include <windows.h>
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_ABOUT DIALOGEX 0, 0, 188, 81
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Dolphin D3D9 Video Plugin"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "Close",IDOK,131,60,50,14
-    LTEXT           "Code by ector",IDC_STATIC,7,7,85,9
-    LTEXT           "Hardware requirements: Radeon 9500 or better, or Geforce FX5200 or better.\nRadeon recommended.",IDC_STATIC,7,19,174,26
-    LTEXT           "Will not work correctly on older GPU:s.",IDC_STATIC,7,47,170,8
-END
-
-IDD_SETTINGS DIALOGEX 0, 0, 244, 183
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_SYSMENU
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    LTEXT           "&Graphics card:",IDC_STATIC,7,7,49,8
-    COMBOBOX        IDC_ADAPTER,61,7,176,48,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "&V-Sync",IDC_VSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,61,25,36,8
-    CONTROL         "&Widescreen Hack",IDC_WIDESCREEN_HACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,25,67,10
-    LTEXT           "&Aspect Ratio:",IDC_STATIC,7,40,48,8
-    COMBOBOX        IDC_ASPECTRATIO,61,39,89,57,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "SSAA mode:",IDC_STATIC,7,61,46,8
-    COMBOBOX        IDC_ANTIALIASMODE,61,59,48,73,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "&Enable CPU->EFB access ",IDC_EFB_ACCESS_ENABLE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,80,94,11
-    GROUPBOX        "Safe Texture Cache Mode",IDC_STATIC,109,94,125,27
-    CONTROL         "&Safe Texture Cache",IDC_SAFE_TEXTURE_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,104,80,11
-    CONTROL         "Safe",IDC_SAFE_TEXTURE_CACHE_SAFE,"Button",BS_AUTORADIOBUTTON,117,105,27,10
-    CONTROL         "Normal",IDC_SAFE_TEXTURE_CACHE_NORMAL,"Button",BS_AUTORADIOBUTTON,154,105,38,10
-    CONTROL         "Fast",IDC_SAFE_TEXTURE_CACHE_FAST,"Button",BS_AUTORADIOBUTTON,198,105,30,10
-    CONTROL         "",IDC_DXCHK,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_BORDER | WS_TABSTOP,30,126,186,50
-    COMBOBOX        IDC_EFBSCALE,161,59,76,73,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "EFB Scale:",IDC_STATIC,127,61,34,8
-END
-
-IDD_ADVANCED DIALOGEX 0, 0, 244, 200
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_BORDER | WS_SYSMENU
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX        "&Settings",IDC_STATIC,6,7,228,89
-    CONTROL         "Overlay FPS counter",IDC_OVERLAYFPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,18,82,8
-    CONTROL         "&Overlay some statistics",IDC_OVERLAYSTATS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,155,90,8
-    CONTROL         "Show s&hader compilation errors",IDC_SHOWSHADERERRORS,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,169,114,8
-    CONTROL         "Enable &Wireframe",IDC_WIREFRAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,48,87,8
-    CONTROL         "Disable Fog",IDC_DISABLEFOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,18,78,8
-    CONTROL         "Enable Hotkey",IDC_OSDHOTKEY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,33,87,8
-    CONTROL         "Enable EFB copy",IDC_ENABLEEFBCOPY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,33,81,8
-    CONTROL         "To RAM",IDC_EFBTORAM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,29,44,59,10
-    CONTROL         "To Texture",IDC_EFBTOTEX,"Button",BS_AUTORADIOBUTTON,29,57,60,10
-    GROUPBOX        "&Data dumping",IDC_STATIC,7,100,228,41
-    CONTROL         "Dump &textures",IDC_TEXDUMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,111,70,9
-    CONTROL         "Dump Frames to User/Dump/Frames",IDC_DUMPFRAMES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,125,138,9
-    GROUPBOX        "Debugging Tools",IDC_STATIC,7,143,228,51
-    CONTROL         "Enable TexFmt Overlay",IDC_TEXFMT_OVERLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,182,92,10
-    CONTROL         "Centered",IDC_TEXFMT_CENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,183,52,10
-    CONTROL         "Enable XFB",IDC_ENABLEXFB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,71,81,8
-    CONTROL         "Enable Real XFB",IDC_ENABLEREALXFB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,71,81,8
-    CONTROL         "Use Native Mips",IDC_USENATIVEMIPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,83,67,10
-END
-
-IDD_ENHANCEMENTS DIALOGEX 0, 0, 224, 175
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    GROUPBOX        "Texture &filtering",IDC_STATIC,7,7,210,60
-    CONTROL         "Force &bi/trilinear (breaks video in several Wii games)",IDC_FORCEFILTERING,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,20,192,9
-    CONTROL         "Enable 16x &anisotropy filtering",IDC_FORCEANISOTROPY,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,35,110,10
-    CONTROL         "Enable hires texture loading",IDC_LOADHIRESTEXTURE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,50,110,11
-    GROUPBOX        "EFB Hacks",IDC_STATIC,7,70,210,27
-    CONTROL         "EFB Scaled Copy",IDC_EFBSCALEDCOPY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,80,110,12
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
-BEGIN
-    IDD_ABOUT, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 181
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 74
-    END
-
-    IDD_SETTINGS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 237
-        VERTGUIDE, 7
-        VERTGUIDE, 61
-        VERTGUIDE, 109
-        VERTGUIDE, 161
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 176
-    END
-
-    IDD_ADVANCED, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 237
-        VERTGUIDE, 14
-        VERTGUIDE, 29
-        VERTGUIDE, 114
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 195
-        HORZGUIDE, 18
-        HORZGUIDE, 33
-        HORZGUIDE, 49
-        HORZGUIDE, 156
-    END
-
-    IDD_ENHANCEMENTS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 217
-        VERTGUIDE, 16
-        VERTGUIDE, 74
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 168
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include <windows.h>\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-