mirror of https://github.com/PCSX2/pcsx2.git
GSdx:
Added a check box and config code for the fxaa shader. It's not currently hooked up since the shader setup might get replaced in a day or two. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5777 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
be185275c9
commit
f4370077f0
|
@ -271,13 +271,17 @@ bool GSDevice11::Create(GSWnd* wnd)
|
||||||
|
|
||||||
hr = m_dev->CreateBuffer(&bd, NULL, &m_fxaa.cb);
|
hr = m_dev->CreateBuffer(&bd, NULL, &m_fxaa.cb);
|
||||||
|
|
||||||
|
#if EXTERNAL_SHADER_LOADING
|
||||||
try {
|
try {
|
||||||
CompileShader("shader.fx", "ps_main", NULL, &m_fxaa.ps);
|
CompileShader("shader.fx", "ps_main", NULL, &m_fxaa.ps);
|
||||||
}
|
}
|
||||||
catch (GSDXRecoverableError) {
|
catch (GSDXRecoverableError) {
|
||||||
CompileShader(IDR_FXAA_FX, "ps_main", NULL, &m_fxaa.ps);
|
CompileShader(IDR_FXAA_FX, "ps_main", NULL, &m_fxaa.ps);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
// internal shader
|
||||||
|
CompileShader(IDR_FXAA_FX, "ps_main", NULL, &m_fxaa.ps);
|
||||||
|
#endif
|
||||||
//
|
//
|
||||||
|
|
||||||
memset(&rd, 0, sizeof(rd));
|
memset(&rd, 0, sizeof(rd));
|
||||||
|
|
|
@ -359,14 +359,16 @@ bool GSDevice9::Create(GSWnd* wnd)
|
||||||
CompileShader(IDR_SHADEBOOST_FX, "ps_main", macro, &m_shadeboost.ps);
|
CompileShader(IDR_SHADEBOOST_FX, "ps_main", macro, &m_shadeboost.ps);
|
||||||
|
|
||||||
// fxaa
|
// fxaa
|
||||||
|
#if EXTERNAL_SHADER_LOADING
|
||||||
try {
|
try {
|
||||||
CompileShader("shader.fx", "ps_main", NULL, &m_fxaa.ps);
|
CompileShader("shader.fx", "ps_main", NULL, &m_fxaa.ps);
|
||||||
}
|
}
|
||||||
catch (GSDXRecoverableError) {
|
catch (GSDXRecoverableError) {
|
||||||
CompileShader(IDR_FXAA_FX, "ps_main", NULL, &m_fxaa.ps);
|
CompileShader(IDR_FXAA_FX, "ps_main", NULL, &m_fxaa.ps);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
CompileShader(IDR_FXAA_FX, "ps_main", NULL, &m_fxaa.ps);
|
||||||
|
#endif
|
||||||
// create shader layout
|
// create shader layout
|
||||||
|
|
||||||
VSSelector sel;
|
VSSelector sel;
|
||||||
|
|
|
@ -160,6 +160,9 @@ void GSSettingsDlg::OnInit()
|
||||||
|
|
||||||
// Shade Boost
|
// Shade Boost
|
||||||
CheckDlgButton(m_hWnd, IDC_SHADEBOOST, theApp.GetConfig("ShadeBoost", 0));
|
CheckDlgButton(m_hWnd, IDC_SHADEBOOST, theApp.GetConfig("ShadeBoost", 0));
|
||||||
|
|
||||||
|
// FXAA shader
|
||||||
|
CheckDlgButton(m_hWnd, IDC_FXAA, theApp.GetConfig("Fxaa", 0));
|
||||||
|
|
||||||
// Hacks
|
// Hacks
|
||||||
CheckDlgButton(m_hWnd, IDC_HACKS_ENABLED, theApp.GetConfig("UserHacks", 0));
|
CheckDlgButton(m_hWnd, IDC_HACKS_ENABLED, theApp.GetConfig("UserHacks", 0));
|
||||||
|
@ -268,7 +271,9 @@ bool GSSettingsDlg::OnCommand(HWND hWnd, UINT id, UINT code)
|
||||||
// Shade Boost
|
// Shade Boost
|
||||||
theApp.SetConfig("ShadeBoost", (int)IsDlgButtonChecked(m_hWnd, IDC_SHADEBOOST));
|
theApp.SetConfig("ShadeBoost", (int)IsDlgButtonChecked(m_hWnd, IDC_SHADEBOOST));
|
||||||
|
|
||||||
// Hacks
|
// FXAA shader
|
||||||
|
theApp.SetConfig("Fxaa", (int)IsDlgButtonChecked(m_hWnd, IDC_FXAA));
|
||||||
|
|
||||||
theApp.SetConfig("UserHacks", (int)IsDlgButtonChecked(m_hWnd, IDC_HACKS_ENABLED));
|
theApp.SetConfig("UserHacks", (int)IsDlgButtonChecked(m_hWnd, IDC_HACKS_ENABLED));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -13,11 +13,16 @@
|
||||||
#define APSTUDIO_HIDDEN_SYMBOLS
|
#define APSTUDIO_HIDDEN_SYMBOLS
|
||||||
#include "windows.h"
|
#include "windows.h"
|
||||||
#undef APSTUDIO_HIDDEN_SYMBOLS
|
#undef APSTUDIO_HIDDEN_SYMBOLS
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
#undef APSTUDIO_READONLY_SYMBOLS
|
#undef APSTUDIO_READONLY_SYMBOLS
|
||||||
|
|
||||||
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
// English (United States) resources
|
||||||
|
|
||||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||||
|
#pragma code_page(1252)
|
||||||
|
|
||||||
#ifdef APSTUDIO_INVOKED
|
#ifdef APSTUDIO_INVOKED
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
@ -129,13 +134,13 @@ BEGIN
|
||||||
RTEXT "100",IDC_CONTRAST_TEXT,288,75,15,8
|
RTEXT "100",IDC_CONTRAST_TEXT,288,75,15,8
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_CONFIG DIALOGEX 0, 0, 189, 345
|
IDD_CONFIG DIALOGEX 0, 0, 189, 370
|
||||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||||
CAPTION "Settings..."
|
CAPTION "Settings..."
|
||||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||||
BEGIN
|
BEGIN
|
||||||
CONTROL 2022,IDC_LOGO11,"Static",SS_BITMAP,7,7,175,42
|
CONTROL IDB_LOGO10,IDC_LOGO11,"Static",SS_BITMAP | SS_CENTERIMAGE,7,7,175,42
|
||||||
CONTROL 2021,IDC_LOGO9,"Static",SS_BITMAP,7,7,175,44
|
CONTROL IDB_LOGO9,IDC_LOGO9,"Static",SS_BITMAP | SS_CENTERIMAGE,7,7,175,44
|
||||||
LTEXT "Resolution:",IDC_STATIC,7,73,37,8
|
LTEXT "Resolution:",IDC_STATIC,7,73,37,8
|
||||||
COMBOBOX IDC_RESOLUTION,71,71,72,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_RESOLUTION,71,71,72,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
LTEXT "Renderer:",IDC_STATIC,7,88,34,8
|
LTEXT "Renderer:",IDC_STATIC,7,88,34,8
|
||||||
|
@ -144,8 +149,8 @@ BEGIN
|
||||||
COMBOBOX IDC_INTERLACE,71,101,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_INTERLACE,71,101,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
LTEXT "Aspect Ratio (F6):",IDC_STATIC,7,118,60,8
|
LTEXT "Aspect Ratio (F6):",IDC_STATIC,7,118,60,8
|
||||||
COMBOBOX IDC_ASPECTRATIO,71,116,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_ASPECTRATIO,71,116,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
DEFPUSHBUTTON "OK",IDOK,43,324,50,14
|
DEFPUSHBUTTON "OK",IDOK,43,349,50,14
|
||||||
PUSHBUTTON "Cancel",IDCANCEL,96,324,50,14
|
PUSHBUTTON "Cancel",IDCANCEL,96,349,50,14
|
||||||
CONTROL "Window",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,146,73,36,10
|
CONTROL "Window",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,146,73,36,10
|
||||||
LTEXT "D3D internal res:",IDC_STATIC,18,152,55,8
|
LTEXT "D3D internal res:",IDC_STATIC,18,152,55,8
|
||||||
EDITTEXT IDC_RESX_EDIT,82,149,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
EDITTEXT IDC_RESX_EDIT,82,149,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||||
|
@ -157,22 +162,23 @@ BEGIN
|
||||||
LTEXT "Or use Scaling:",IDC_STATIC,18,167,49,8
|
LTEXT "Or use Scaling:",IDC_STATIC,18,167,49,8
|
||||||
LTEXT "Or use original PS2 resolution :",IDC_STATIC,18,182,99,8
|
LTEXT "Or use original PS2 resolution :",IDC_STATIC,18,182,99,8
|
||||||
GROUPBOX "D3D Enhancements (can cause glitches)",IDC_STATIC,7,134,175,66,BS_CENTER
|
GROUPBOX "D3D Enhancements (can cause glitches)",IDC_STATIC,7,134,175,66,BS_CENTER
|
||||||
LTEXT "Extra rendering threads:",IDC_STATIC,11,292,80,8
|
LTEXT "Extra rendering threads:",IDC_STATIC,11,308,80,8
|
||||||
EDITTEXT IDC_SWTHREADS_EDIT,93,291,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
EDITTEXT IDC_SWTHREADS_EDIT,93,307,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||||
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,124,290,11,14
|
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,124,306,11,14
|
||||||
CONTROL "Texture filtering",IDC_FILTER,"Button",BS_AUTO3STATE | WS_TABSTOP,11,230,67,10
|
CONTROL "Texture filtering",IDC_FILTER,"Button",BS_AUTO3STATE | WS_TABSTOP,11,246,67,10
|
||||||
CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,231,58,10
|
CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,247,58,10
|
||||||
CONTROL "Allow 8-bit textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,246,78,10
|
CONTROL "Allow 8-bit textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,262,78,10
|
||||||
CONTROL "Alpha correction (FBA)",IDC_FBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,246,85,10
|
CONTROL "Alpha correction (FBA)",IDC_FBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,262,85,10
|
||||||
CONTROL "Edge anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,307,93,10
|
CONTROL "Edge anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,323,93,10
|
||||||
CONTROL "Enable Shade Boost",IDC_SHADEBOOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,204,79,10
|
CONTROL "Enable Shade Boost",IDC_SHADEBOOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,204,79,10
|
||||||
PUSHBUTTON "Settings...",IDC_SHADEBUTTON,88,201,87,14
|
PUSHBUTTON "Settings...",IDC_SHADEBUTTON,88,201,87,14
|
||||||
GROUPBOX "Software Mode Settings",IDC_STATIC,7,280,175,42,BS_CENTER
|
GROUPBOX "Software Mode Settings",IDC_STATIC,7,296,175,42,BS_CENTER
|
||||||
GROUPBOX "Hardware Mode Settings",IDC_STATIC,7,218,175,61,BS_CENTER
|
GROUPBOX "Hardware Mode Settings",IDC_STATIC,7,234,175,61,BS_CENTER
|
||||||
CONTROL "Enable HW Hacks",IDC_HACKS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,262,71,10
|
CONTROL "Enable HW Hacks",IDC_HACKS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,278,71,10
|
||||||
PUSHBUTTON "Configure...",IDC_HACKSBUTTON,88,259,87,14
|
PUSHBUTTON "Configure...",IDC_HACKSBUTTON,88,275,87,14
|
||||||
LTEXT "Adapter:",IDC_STATIC,7,58,30,8
|
LTEXT "Adapter:",IDC_STATIC,7,58,30,8
|
||||||
COMBOBOX IDC_ADAPTER,71,56,111,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_ADAPTER,71,56,111,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
|
CONTROL "FXAA shader",IDC_FXAA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,221,55,10
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_CAPTURE DIALOGEX 0, 0, 279, 71
|
IDD_CAPTURE DIALOGEX 0, 0, 279, 71
|
||||||
|
@ -197,7 +203,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
|
||||||
CAPTION "Settings..."
|
CAPTION "Settings..."
|
||||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||||
BEGIN
|
BEGIN
|
||||||
CONTROL 2021,IDC_LOGO9,"Static",SS_BITMAP,7,7,175,44
|
CONTROL IDB_LOGO9,IDC_LOGO9,"Static",SS_BITMAP,7,7,175,44
|
||||||
LTEXT "Resolution:",IDC_STATIC,7,59,37,8
|
LTEXT "Resolution:",IDC_STATIC,7,59,37,8
|
||||||
COMBOBOX IDC_RESOLUTION,80,57,102,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_RESOLUTION,80,57,102,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
LTEXT "Renderer:",IDC_STATIC,7,74,34,8
|
LTEXT "Renderer:",IDC_STATIC,7,74,34,8
|
||||||
|
@ -213,19 +219,19 @@ BEGIN
|
||||||
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,99,161,11,14
|
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
|
DEFPUSHBUTTON "OK",IDOK,43,178,50,14
|
||||||
PUSHBUTTON "Cancel",IDCANCEL,96,178,50,14
|
PUSHBUTTON "Cancel",IDCANCEL,96,178,50,14
|
||||||
CONTROL 2022,IDC_LOGO11,"Static",SS_BITMAP,7,7,173,42
|
CONTROL IDB_LOGO10,IDC_LOGO11,"Static",SS_BITMAP,7,7,173,42
|
||||||
LTEXT "Internal Resolution:",IDC_STATIC,7,135,64,8
|
LTEXT "Internal Resolution:",IDC_STATIC,7,135,64,8
|
||||||
COMBOBOX IDC_SCALE,80,132,102,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
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
|
CONTROL "Windowed",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,129,157,49,10
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_CONFIG2 DIALOGEX 0, 0, 187, 325
|
IDD_CONFIG2 DIALOGEX 0, 0, 187, 342
|
||||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||||
CAPTION "Settings..."
|
CAPTION "Settings..."
|
||||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||||
BEGIN
|
BEGIN
|
||||||
CONTROL 2022,IDC_LOGO11,"Static",SS_BITMAP,6,6,173,42
|
CONTROL IDB_LOGO10,IDC_LOGO11,"Static",SS_BITMAP | SS_CENTERIMAGE,6,6,173,42
|
||||||
DEFPUSHBUTTON "OK",IDOK,35,304,50,14
|
DEFPUSHBUTTON "OK",IDOK,35,321,50,14
|
||||||
LTEXT "Renderer:",IDC_STATIC,6,72,34,8
|
LTEXT "Renderer:",IDC_STATIC,6,72,34,8
|
||||||
COMBOBOX IDC_RENDERER,70,70,111,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_RENDERER,70,70,111,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
LTEXT "Interlacing (F5):",IDC_STATIC,6,87,53,8
|
LTEXT "Interlacing (F5):",IDC_STATIC,6,87,53,8
|
||||||
|
@ -236,28 +242,29 @@ BEGIN
|
||||||
EDITTEXT IDC_RESY_EDIT,130,147,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
EDITTEXT IDC_RESY_EDIT,130,147,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||||
CONTROL "",IDC_RESY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,154,147,11,14
|
CONTROL "",IDC_RESY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,154,147,11,14
|
||||||
CONTROL "Native",IDC_NATIVERES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,120,33,10
|
CONTROL "Native",IDC_NATIVERES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,120,33,10
|
||||||
LTEXT "Extra rendering threads:",IDC_STATIC,11,267,80,8
|
LTEXT "Extra rendering threads:",IDC_STATIC,11,281,80,8
|
||||||
EDITTEXT IDC_SWTHREADS_EDIT,94,265,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
EDITTEXT IDC_SWTHREADS_EDIT,94,279,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||||
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,129,264,11,14
|
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,129,278,11,14
|
||||||
COMBOBOX IDC_UPSCALE_MULTIPLIER,92,132,74,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_UPSCALE_MULTIPLIER,92,132,74,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
LTEXT "Or use Scaling:",IDC_STATIC,38,134,49,8
|
LTEXT "Or use Scaling:",IDC_STATIC,38,134,49,8
|
||||||
LTEXT "Original PS2 resolution :",IDC_STATIC,10,120,80,8
|
LTEXT "Original PS2 resolution :",IDC_STATIC,10,120,80,8
|
||||||
CONTROL "Edge anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,283,93,10
|
CONTROL "Edge anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,297,93,10
|
||||||
PUSHBUTTON "Cancel",IDCANCEL,89,304,50,14
|
PUSHBUTTON "Cancel",IDCANCEL,89,321,50,14
|
||||||
CONTROL 2021,IDC_LOGO9,"Static",SS_BITMAP,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,102,175,64,BS_CENTER
|
GROUPBOX "D3D Internal resolution (can cause glitches)",IDC_STATIC,6,102,175,64,BS_CENTER
|
||||||
GROUPBOX "Software Mode Settings",IDC_STATIC,6,251,175,50,BS_CENTER
|
GROUPBOX "Software Mode Settings",IDC_STATIC,6,265,175,50,BS_CENTER
|
||||||
GROUPBOX "Hardware Mode Settings",IDC_STATIC,6,186,175,63,BS_CENTER
|
GROUPBOX "Hardware Mode Settings",IDC_STATIC,6,200,175,63,BS_CENTER
|
||||||
CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,199,58,10
|
CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,213,58,10
|
||||||
CONTROL "Alpha correction (FBA)",IDC_FBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,215,87,10
|
CONTROL "Alpha correction (FBA)",IDC_FBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,229,87,10
|
||||||
CONTROL "Allow 8-bit textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,215,82,10
|
CONTROL "Allow 8-bit textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,229,82,10
|
||||||
CONTROL "Texture filtering",IDC_FILTER,"Button",BS_AUTO3STATE | WS_TABSTOP,10,199,67,10
|
CONTROL "Texture filtering",IDC_FILTER,"Button",BS_AUTO3STATE | WS_TABSTOP,10,213,67,10
|
||||||
CONTROL "Enable Shade Boost",IDC_SHADEBOOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,172,79,10
|
CONTROL "Enable Shade Boost",IDC_SHADEBOOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,172,79,10
|
||||||
PUSHBUTTON "Settings...",IDC_SHADEBUTTON,95,169,75,14
|
PUSHBUTTON "Settings...",IDC_SHADEBUTTON,95,169,75,14
|
||||||
CONTROL "Enable HW Hacks",IDC_HACKS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,231,71,10
|
CONTROL "Enable HW Hacks",IDC_HACKS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,245,71,10
|
||||||
PUSHBUTTON "Configure...",IDC_HACKSBUTTON,95,228,75,14
|
PUSHBUTTON "Configure...",IDC_HACKSBUTTON,95,242,75,14
|
||||||
LTEXT "Adapter:",IDC_STATIC,6,57,30,8
|
LTEXT "Adapter:",IDC_STATIC,6,57,30,8
|
||||||
COMBOBOX IDC_ADAPTER,70,55,111,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_ADAPTER,70,55,111,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
|
CONTROL "FXAA shader",IDC_FXAA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,188,55,10
|
||||||
END
|
END
|
||||||
|
|
||||||
|
|
||||||
|
@ -289,11 +296,12 @@ BEGIN
|
||||||
BEGIN
|
BEGIN
|
||||||
LEFTMARGIN, 7
|
LEFTMARGIN, 7
|
||||||
RIGHTMARGIN, 182
|
RIGHTMARGIN, 182
|
||||||
|
VERTGUIDE, 11
|
||||||
VERTGUIDE, 71
|
VERTGUIDE, 71
|
||||||
VERTGUIDE, 89
|
VERTGUIDE, 89
|
||||||
VERTGUIDE, 182
|
VERTGUIDE, 182
|
||||||
TOPMARGIN, 7
|
TOPMARGIN, 7
|
||||||
BOTTOMMARGIN, 338
|
BOTTOMMARGIN, 363
|
||||||
HORZGUIDE, 49
|
HORZGUIDE, 49
|
||||||
END
|
END
|
||||||
|
|
||||||
|
@ -319,9 +327,10 @@ BEGIN
|
||||||
BEGIN
|
BEGIN
|
||||||
LEFTMARGIN, 6
|
LEFTMARGIN, 6
|
||||||
RIGHTMARGIN, 181
|
RIGHTMARGIN, 181
|
||||||
|
VERTGUIDE, 11
|
||||||
VERTGUIDE, 87
|
VERTGUIDE, 87
|
||||||
TOPMARGIN, 6
|
TOPMARGIN, 6
|
||||||
BOTTOMMARGIN, 318
|
BOTTOMMARGIN, 335
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
#endif // APSTUDIO_INVOKED
|
#endif // APSTUDIO_INVOKED
|
||||||
|
|
|
@ -25,6 +25,8 @@
|
||||||
|
|
||||||
#define ENABLE_JIT_RASTERIZER
|
#define ENABLE_JIT_RASTERIZER
|
||||||
|
|
||||||
|
#define EXTERNAL_SHADER_LOADING 1
|
||||||
|
|
||||||
//#define ENABLE_DYNAMIC_CRC_HACK
|
//#define ENABLE_DYNAMIC_CRC_HACK
|
||||||
#define DYNA_DLL_PATH "c:/dev/pcsx2/trunk/tools/dynacrchack/DynaCrcHack.dll"
|
#define DYNA_DLL_PATH "c:/dev/pcsx2/trunk/tools/dynacrchack/DynaCrcHack.dll"
|
||||||
|
|
||||||
|
|
|
@ -2,31 +2,6 @@
|
||||||
// Microsoft Visual C++ generated include file.
|
// Microsoft Visual C++ generated include file.
|
||||||
// Used by GSdx.rc
|
// Used by GSdx.rc
|
||||||
//
|
//
|
||||||
/*
|
|
||||||
* Copyright (C) 2007-2009 Gabest
|
|
||||||
* http://www.gabest.org
|
|
||||||
*
|
|
||||||
* This Program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 2, or (at your option)
|
|
||||||
* any later version.
|
|
||||||
*
|
|
||||||
* This Program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with GNU Make; see the file COPYING. If not, write to
|
|
||||||
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA USA.
|
|
||||||
* http://www.gnu.org/copyleft/gpl.html
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef IDC_STATIC
|
|
||||||
#define IDC_STATIC -1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define IDC_NATIVERES 2001
|
#define IDC_NATIVERES 2001
|
||||||
#define IDC_PALTEX 2003
|
#define IDC_PALTEX 2003
|
||||||
#define IDC_LOGZ 2004
|
#define IDC_LOGZ 2004
|
||||||
|
@ -91,6 +66,7 @@
|
||||||
#define IDC_TCOFFSETX2 2083
|
#define IDC_TCOFFSETX2 2083
|
||||||
#define IDC_TCOFFSETY 2084
|
#define IDC_TCOFFSETY 2084
|
||||||
#define IDC_TCOFFSETY2 2085
|
#define IDC_TCOFFSETY2 2085
|
||||||
|
#define IDC_FXAA 2086
|
||||||
#define IDC_COLORSPACE 3000
|
#define IDC_COLORSPACE 3000
|
||||||
#define IDR_CONVERT_FX 10000
|
#define IDR_CONVERT_FX 10000
|
||||||
#define IDR_TFX_FX 10001
|
#define IDR_TFX_FX 10001
|
||||||
|
@ -102,6 +78,7 @@
|
||||||
#define IDD_SHADEBOOST 10007
|
#define IDD_SHADEBOOST 10007
|
||||||
#define IDR_SHADEBOOST_FX 10009
|
#define IDR_SHADEBOOST_FX 10009
|
||||||
#define IDD_HACKS 10011
|
#define IDD_HACKS 10011
|
||||||
|
#define IDC_STATIC -1
|
||||||
|
|
||||||
// Next default values for new objects
|
// Next default values for new objects
|
||||||
//
|
//
|
||||||
|
@ -109,7 +86,7 @@
|
||||||
#ifndef APSTUDIO_READONLY_SYMBOLS
|
#ifndef APSTUDIO_READONLY_SYMBOLS
|
||||||
#define _APS_NEXT_RESOURCE_VALUE 10012
|
#define _APS_NEXT_RESOURCE_VALUE 10012
|
||||||
#define _APS_NEXT_COMMAND_VALUE 32771
|
#define _APS_NEXT_COMMAND_VALUE 32771
|
||||||
#define _APS_NEXT_CONTROL_VALUE 2086
|
#define _APS_NEXT_CONTROL_VALUE 2087
|
||||||
#define _APS_NEXT_SYMED_VALUE 5000
|
#define _APS_NEXT_SYMED_VALUE 5000
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue