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

Merge pull request #829 from ssakash/rework_internalres 

gsdx changes:
Remove native resolution checkbox from GUI and rework associated code
Small changes to Windows and Linux GUI
Support 8x native resolution
Fix custom resolution width less than native width use case
This commit is contained in:
Jonathan Li 2015-09-21 20:12:47 +01:00
parent 130a84d2af d4f6894e1b
commit 69d27dfb4b
9 changed files with 113 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GSdx/GSDeviceOGL.cpp
View File

@ -247,7 +247,7 @@ bool GSDeviceOGL::Create(GSWnd* wnd)
m_convert.cb = new GSUniformBufferOGL(g_convert_index, sizeof(ConvertConstantBuffer)); m_convert.cb = new GSUniformBufferOGL(g_convert_index, sizeof(ConvertConstantBuffer));
// Upload once and forget about it // Upload once and forget about it
ConvertConstantBuffer cb; ConvertConstantBuffer cb;
cb.ScalingFactor = GSVector4i(theApp.GetConfig("nativeres", 0) ? 1 : theApp.GetConfig("upscale_multiplier", 2)); cb.ScalingFactor = GSVector4i(theApp.GetConfig("upscale_multiplier", 1));
m_convert.cb->upload(&cb); m_convert.cb->upload(&cb);
m_convert.vs = m_shader->Compile("convert.glsl", "vs_main", GL_VERTEX_SHADER, convert_glsl); m_convert.vs = m_shader->Compile("convert.glsl", "vs_main", GL_VERTEX_SHADER, convert_glsl);

28
plugins/GSdx/GSLinuxDialog.cpp
View File

@ -271,29 +271,14 @@ GtkWidget* CreateTableInBox(GtkWidget* parent_box, const char* frame_title, int
return table; return table;
} }
void populate_res_table(GtkWidget* res_table)
{
GtkWidget* native_label = gtk_label_new("Original PS2 Resolution: ");
GtkWidget* native_res_check = CreateCheckBox("Native", "nativeres");
GtkWidget* fsaa_label = gtk_label_new("Or Use Scaling:");
GtkWidget* fsaa_combo_box = CreateComboBoxFromVector(theApp.m_gs_upscale_multiplier, "upscale_multiplier", 2);
GtkWidget* resxy_label = gtk_label_new("Custom Resolution:");
GtkWidget* resx_spin = CreateSpinButton(256, 8192, "resx", 1024);
GtkWidget* resy_spin = CreateSpinButton(256, 8192, "resy", 1024);
s_table_line = 0;
InsertWidgetInTable(res_table, native_label, native_res_check);
InsertWidgetInTable(res_table, fsaa_label, fsaa_combo_box);
InsertWidgetInTable(res_table, resxy_label, resx_spin, resy_spin);
}
void populate_hw_table(GtkWidget* hw_table) void populate_hw_table(GtkWidget* hw_table)
{ {
GtkWidget* filter_label = gtk_label_new ("Texture Filtering:"); GtkWidget* filter_label = gtk_label_new ("Texture Filtering:");
GtkWidget* filter_combo_box = CreateComboBoxFromVector(theApp.m_gs_filter, "filter", 2); GtkWidget* filter_combo_box = CreateComboBoxFromVector(theApp.m_gs_filter, "filter", 2);
GtkWidget* fsaa_label = gtk_label_new("Internal Resolution:");
GtkWidget* fsaa_combo_box = CreateComboBoxFromVector(theApp.m_gs_upscale_multiplier, "upscale_multiplier", 1);
GtkWidget* af_label = gtk_label_new("Anisotropic Filtering:"); GtkWidget* af_label = gtk_label_new("Anisotropic Filtering:");
GtkWidget* af_combo_box = CreateComboBoxFromVector(theApp.m_gs_max_anisotropy, "MaxAnisotropy", 0); GtkWidget* af_combo_box = CreateComboBoxFromVector(theApp.m_gs_max_anisotropy, "MaxAnisotropy", 0);
@ -319,9 +304,10 @@ void populate_hw_table(GtkWidget* hw_table)
s_table_line = 0; s_table_line = 0;
InsertWidgetInTable(hw_table, paltex_check, tc_depth_check); InsertWidgetInTable(hw_table, paltex_check, tc_depth_check);
InsertWidgetInTable(hw_table, acc_date_check); InsertWidgetInTable(hw_table, acc_date_check);
InsertWidgetInTable(hw_table, acc_bld_label, acc_bld_combo_box); InsertWidgetInTable(hw_table, fsaa_label, fsaa_combo_box);
InsertWidgetInTable(hw_table, filter_label, filter_combo_box); InsertWidgetInTable(hw_table, filter_label, filter_combo_box);
InsertWidgetInTable(hw_table, af_label, af_combo_box); InsertWidgetInTable(hw_table, af_label, af_combo_box);
InsertWidgetInTable(hw_table, acc_bld_label, acc_bld_combo_box);
InsertWidgetInTable(hw_table, crc_label, crc_combo_box); InsertWidgetInTable(hw_table, crc_label, crc_combo_box);
} }
@ -523,9 +509,8 @@ bool RunLinuxDialog()
GtkWidget* main_table = CreateTableInBox(main_box , NULL , 2 , 2); GtkWidget* main_table = CreateTableInBox(main_box , NULL , 2 , 2);
GtkWidget* res_table = CreateTableInBox(central_box , "OpenGL Internal Resolution" , 3 , 3);
GtkWidget* shader_table = CreateTableInBox(central_box , "Custom Shader Settings" , 8 , 2); GtkWidget* shader_table = CreateTableInBox(central_box , "Custom Shader Settings" , 8 , 2);
GtkWidget* hw_table = CreateTableInBox(central_box , "Hardware Mode Settings" , 5 , 2); GtkWidget* hw_table = CreateTableInBox(central_box , "Hardware Mode Settings" , 7 , 2);
GtkWidget* sw_table = CreateTableInBox(central_box , "Software Mode Settings" , 3 , 2); GtkWidget* sw_table = CreateTableInBox(central_box , "Software Mode Settings" , 3 , 2);
GtkWidget* hack_table = CreateTableInBox(advance_box , "Hacks" , 9 , 2); GtkWidget* hack_table = CreateTableInBox(advance_box , "Hacks" , 9 , 2);
@ -537,7 +522,6 @@ bool RunLinuxDialog()
// Populate all the tables // Populate all the tables
populate_main_table(main_table); populate_main_table(main_table);
populate_res_table(res_table);
populate_shader_table(shader_table); populate_shader_table(shader_table);
populate_hw_table(hw_table); populate_hw_table(hw_table);
populate_sw_table(sw_table); populate_sw_table(sw_table);

34
plugins/GSdx/GSRendererHW.cpp
View File

@ -35,47 +35,34 @@ GSRendererHW::GSRendererHW(GSTextureCache* tc)
m_userhacks_align_sprite_X = !!theApp.GetConfig("UserHacks_align_sprite_X", 0) && !!theApp.GetConfig("UserHacks", 0); m_userhacks_align_sprite_X = !!theApp.GetConfig("UserHacks_align_sprite_X", 0) && !!theApp.GetConfig("UserHacks", 0);
m_userhacks_round_sprite_offset = !!theApp.GetConfig("UserHacks", 0) ? theApp.GetConfig("UserHacks_round_sprite_offset", 0) : 0; m_userhacks_round_sprite_offset = !!theApp.GetConfig("UserHacks", 0) ? theApp.GetConfig("UserHacks_round_sprite_offset", 0) : 0;
if (m_upscale_multiplier == 1 && !m_nativeres) { //Custom if (m_upscale_multiplier == 9) { //Custom Resolution
m_width = theApp.GetConfig("resx", m_width); m_width = theApp.GetConfig("resx", m_width);
m_height = theApp.GetConfig("resy", m_height); m_height = theApp.GetConfig("resy", m_height);
} }
if (m_upscale_multiplier == 1) { if (m_upscale_multiplier == 1) { // hacks are only needed for upscaling issues.
m_userhacks_round_sprite_offset = 0; m_userhacks_round_sprite_offset = 0;
m_userhacks_align_sprite_X = 0; m_userhacks_align_sprite_X = 0;
} }
} }
void GSRendererHW::SetScaling() { void GSRendererHW::SetScaling()
{
m_buffer_size = max(m_context->FRAME.FBW * 64, m_regs->DISP[m_regs->PMODE.EN1 == 1 ? 0 : 1].DISPFB.FBW * 64); m_buffer_size = max(m_context->FRAME.FBW * 64, m_regs->DISP[m_regs->PMODE.EN1 == 1 ? 0 : 1].DISPFB.FBW * 64);
//Only increase the buffer size, don't make it smaller, it breaks games (GH3) //Only increase the buffer size, don't make it smaller, it breaks games (GH3)
if (!m_nativeres && m_width < (m_buffer_size * m_upscale_multiplier)){ // Also don't change the size for custom resolution (m_upscale_multiplier = 9).
if (m_upscale_multiplier != 9 && m_width < (m_buffer_size * m_upscale_multiplier)) {
m_tc->RemovePartial(); m_tc->RemovePartial();
} } else {
else {
return; return;
} }
m_height = m_buffer_size < 1024 ? 512 : 1024; m_height = m_buffer_size < 1024 ? 512 : 1024;
m_upscale_multiplier = theApp.GetConfig("upscale_multiplier", m_upscale_multiplier); if (m_upscale_multiplier > 1) {
if (m_upscale_multiplier == 1 && !m_nativeres) { //Custom
m_width = theApp.GetConfig("resx", m_width);
m_height = theApp.GetConfig("resy", m_height);
}
if (m_upscale_multiplier > 1)
{
if (m_upscale_multiplier > 6)
{
m_upscale_multiplier = 1; // use the normal upscale math
}
m_width = m_buffer_size * m_upscale_multiplier; m_width = m_buffer_size * m_upscale_multiplier;
m_height *= m_upscale_multiplier; m_height *= m_upscale_multiplier;
} }
@ -104,12 +91,13 @@ bool GSRendererHW::CanUpscale()
return false; return false;
} }
return !m_nativeres && m_regs->PMODE.EN != 0; // upscale ratio depends on the display size, with no output it may not be set correctly (ps2 logo to game transition) return m_upscale_multiplier!=1 && m_regs->PMODE.EN != 0; // upscale ratio depends on the display size, with no output it may not be set correctly (ps2 logo to game transition)
} }
int GSRendererHW::GetUpscaleMultiplier() int GSRendererHW::GetUpscaleMultiplier()
{ {
return m_upscale_multiplier; // Custom resolution (currently 9) needs an upscale multiplier of 1.
return m_upscale_multiplier != 9? m_upscale_multiplier: 1;
} }
void GSRendererHW::Reset() void GSRendererHW::Reset()

15
plugins/GSdx/GSSettingsDlg.cpp
View File

@ -159,7 +159,6 @@ void GSSettingsDlg::OnInit()
CheckDlgButton(m_hWnd, IDC_LOGZ, theApp.GetConfig("logz", 1)); CheckDlgButton(m_hWnd, IDC_LOGZ, theApp.GetConfig("logz", 1));
CheckDlgButton(m_hWnd, IDC_FBA, theApp.GetConfig("fba", 1)); CheckDlgButton(m_hWnd, IDC_FBA, theApp.GetConfig("fba", 1));
CheckDlgButton(m_hWnd, IDC_AA1, theApp.GetConfig("aa1", 0)); CheckDlgButton(m_hWnd, IDC_AA1, theApp.GetConfig("aa1", 0));
CheckDlgButton(m_hWnd, IDC_NATIVERES, theApp.GetConfig("nativeres", 1));
CheckDlgButton(m_hWnd, IDC_ACCURATE_DATE, theApp.GetConfig("accurate_date", 0)); CheckDlgButton(m_hWnd, IDC_ACCURATE_DATE, theApp.GetConfig("accurate_date", 0));
CheckDlgButton(m_hWnd, IDC_TC_DEPTH, theApp.GetConfig("texture_cache_depth", 0)); CheckDlgButton(m_hWnd, IDC_TC_DEPTH, theApp.GetConfig("texture_cache_depth", 0));
@ -220,7 +219,6 @@ bool GSSettingsDlg::OnCommand(HWND hWnd, UINT id, UINT code)
if (code == CBN_SELCHANGE) if (code == CBN_SELCHANGE)
UpdateControls(); UpdateControls();
break; break;
case IDC_NATIVERES:
case IDC_SHADEBOOST: case IDC_SHADEBOOST:
case IDC_PALTEX: case IDC_PALTEX:
case IDC_HACKS_ENABLED: case IDC_HACKS_ENABLED:
@ -294,7 +292,6 @@ bool GSSettingsDlg::OnCommand(HWND hWnd, UINT id, UINT code)
theApp.SetConfig("logz", (int)IsDlgButtonChecked(m_hWnd, IDC_LOGZ)); theApp.SetConfig("logz", (int)IsDlgButtonChecked(m_hWnd, IDC_LOGZ));
theApp.SetConfig("fba", (int)IsDlgButtonChecked(m_hWnd, IDC_FBA)); theApp.SetConfig("fba", (int)IsDlgButtonChecked(m_hWnd, IDC_FBA));
theApp.SetConfig("aa1", (int)IsDlgButtonChecked(m_hWnd, IDC_AA1)); theApp.SetConfig("aa1", (int)IsDlgButtonChecked(m_hWnd, IDC_AA1));
theApp.SetConfig("nativeres", (int)IsDlgButtonChecked(m_hWnd, IDC_NATIVERES));
theApp.SetConfig("resx", (int)SendMessage(GetDlgItem(m_hWnd, IDC_RESX), UDM_GETPOS, 0, 0)); theApp.SetConfig("resx", (int)SendMessage(GetDlgItem(m_hWnd, IDC_RESX), UDM_GETPOS, 0, 0));
theApp.SetConfig("resy", (int)SendMessage(GetDlgItem(m_hWnd, IDC_RESY), UDM_GETPOS, 0, 0)); theApp.SetConfig("resy", (int)SendMessage(GetDlgItem(m_hWnd, IDC_RESY), UDM_GETPOS, 0, 0));
theApp.SetConfig("extrathreads", (int)SendMessage(GetDlgItem(m_hWnd, IDC_SWTHREADS), UDM_GETPOS, 0, 0)); theApp.SetConfig("extrathreads", (int)SendMessage(GetDlgItem(m_hWnd, IDC_SWTHREADS), UDM_GETPOS, 0, 0));
@ -381,7 +378,6 @@ void GSSettingsDlg::UpdateControls()
//bool sw = i == 1 || i == 4 || i == 10 || i == 13; //bool sw = i == 1 || i == 4 || i == 10 || i == 13;
bool ocl = i >= 14 && i <= 17; bool ocl = i >= 14 && i <= 17;
bool native = !!IsDlgButtonChecked(m_hWnd, IDC_NATIVERES);
ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO9), dx9 ? SW_SHOW : SW_HIDE); ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO9), dx9 ? SW_SHOW : SW_HIDE);
ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO11), dx11 ? SW_SHOW : SW_HIDE); ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO11), dx11 ? SW_SHOW : SW_HIDE);
@ -398,12 +394,11 @@ void GSSettingsDlg::UpdateControls()
EnableWindow(GetDlgItem(m_hWnd, IDC_CRC_LEVEL), hw); EnableWindow(GetDlgItem(m_hWnd, IDC_CRC_LEVEL), hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_CRC_LEVEL_TEXT), hw); EnableWindow(GetDlgItem(m_hWnd, IDC_CRC_LEVEL_TEXT), hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_OPENCL_DEVICE), ocl); EnableWindow(GetDlgItem(m_hWnd, IDC_OPENCL_DEVICE), ocl);
EnableWindow(GetDlgItem(m_hWnd, IDC_RESX), hw && !native && scaling == 1); EnableWindow(GetDlgItem(m_hWnd, IDC_RESX), hw && scaling == 9);
EnableWindow(GetDlgItem(m_hWnd, IDC_RESX_EDIT), hw && !native && scaling == 1); EnableWindow(GetDlgItem(m_hWnd, IDC_RESX_EDIT), hw && scaling == 9);
EnableWindow(GetDlgItem(m_hWnd, IDC_RESY), hw && !native && scaling == 1); EnableWindow(GetDlgItem(m_hWnd, IDC_RESY), hw && scaling == 9);
EnableWindow(GetDlgItem(m_hWnd, IDC_RESY_EDIT), hw && !native && scaling == 1); EnableWindow(GetDlgItem(m_hWnd, IDC_RESY_EDIT), hw && scaling == 9);
EnableWindow(GetDlgItem(m_hWnd, IDC_UPSCALE_MULTIPLIER), hw && !native); EnableWindow(GetDlgItem(m_hWnd, IDC_UPSCALE_MULTIPLIER), hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_NATIVERES), hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_FILTER), hw); EnableWindow(GetDlgItem(m_hWnd, IDC_FILTER), hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_PALTEX), hw); EnableWindow(GetDlgItem(m_hWnd, IDC_PALTEX), hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_LOGZ), dx9 && hw); EnableWindow(GetDlgItem(m_hWnd, IDC_LOGZ), dx9 && hw);

2
plugins/GSdx/GSState.cpp
View File

@ -46,7 +46,7 @@ GSState::GSState()
, m_frameskip(0) , m_frameskip(0)
, m_crcinited(false) , m_crcinited(false)
{ {
m_nativeres = !!theApp.GetConfig("nativeres", 1); m_nativeres = theApp.GetConfig("upscale_multiplier",1)==1;
m_mipmap = !!theApp.GetConfig("mipmap", 1); m_mipmap = !!theApp.GetConfig("mipmap", 1);
s_n = 0; s_n = 0;

1
plugins/GSdx/GSTextureCache.cpp
View File

@ -1122,6 +1122,7 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con
case 4: modx = 4.2f; mody = 4.2f; dst->m_texture->LikelyOffset = true; break; case 4: modx = 4.2f; mody = 4.2f; dst->m_texture->LikelyOffset = true; break;
case 5: modx = 5.3f; mody = 5.3f; dst->m_texture->LikelyOffset = true; break; case 5: modx = 5.3f; mody = 5.3f; dst->m_texture->LikelyOffset = true; break;
case 6: modx = 6.2f; mody = 6.2f; dst->m_texture->LikelyOffset = true; break; case 6: modx = 6.2f; mody = 6.2f; dst->m_texture->LikelyOffset = true; break;
case 8: modx = 8.2f; mody = 8.2f; dst->m_texture->LikelyOffset = true; break;
default: modx = 0.0f; mody = 0.0f; dst->m_texture->LikelyOffset = false; break; default: modx = 0.0f; mody = 0.0f; dst->m_texture->LikelyOffset = false; break;
} }
} }

4
plugins/GSdx/GSdx.cpp
View File

@ -155,12 +155,14 @@ GSdxApp::GSdxApp()
m_gs_aspectratio.push_back(GSSetting(1, "4:3", "")); m_gs_aspectratio.push_back(GSSetting(1, "4:3", ""));
m_gs_aspectratio.push_back(GSSetting(2, "16:9", "")); m_gs_aspectratio.push_back(GSSetting(2, "16:9", ""));
m_gs_upscale_multiplier.push_back(GSSetting(1, "Custom", "")); m_gs_upscale_multiplier.push_back(GSSetting(1, "Native", ""));
m_gs_upscale_multiplier.push_back(GSSetting(2, "2x Native", "")); m_gs_upscale_multiplier.push_back(GSSetting(2, "2x Native", ""));
m_gs_upscale_multiplier.push_back(GSSetting(3, "3x Native", "")); m_gs_upscale_multiplier.push_back(GSSetting(3, "3x Native", ""));
m_gs_upscale_multiplier.push_back(GSSetting(4, "4x Native", "")); m_gs_upscale_multiplier.push_back(GSSetting(4, "4x Native", ""));
m_gs_upscale_multiplier.push_back(GSSetting(5, "5x Native", "")); m_gs_upscale_multiplier.push_back(GSSetting(5, "5x Native", ""));
m_gs_upscale_multiplier.push_back(GSSetting(6, "6x Native", "")); m_gs_upscale_multiplier.push_back(GSSetting(6, "6x Native", ""));
m_gs_upscale_multiplier.push_back(GSSetting(8, "8x Native", ""));
m_gs_upscale_multiplier.push_back(GSSetting(9, "Custom", ""));
m_gs_max_anisotropy.push_back(GSSetting(0, "Off", "")); m_gs_max_anisotropy.push_back(GSSetting(0, "Off", ""));
m_gs_max_anisotropy.push_back(GSSetting(2, "2x", "")); m_gs_max_anisotropy.push_back(GSSetting(2, "2x", ""));

18
plugins/GSdx/GSdx.rc
View File

@ -192,23 +192,21 @@ BEGIN
COMBOBOX IDC_RENDERER,68,70,111,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_RENDERER,68,70,111,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Interlacing (F5):",IDC_STATIC,6,101,53,8 LTEXT "Interlacing (F5):",IDC_STATIC,6,101,53,8
COMBOBOX IDC_INTERLACE,68,99,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_INTERLACE,68,99,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
RTEXT "Custom Resolution:",IDC_STATIC,25,159,65,8 RTEXT "Custom Resolution:",IDC_STATIC,25,148,65,8
EDITTEXT IDC_RESX_EDIT,94,157,39,13,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_RESX_EDIT,94,146,39,13,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "",IDC_RESX,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,120,157,11,14 CONTROL "",IDC_RESX,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,120,146,11,14
EDITTEXT IDC_RESY_EDIT,136,157,39,13,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_RESY_EDIT,136,146,39,13,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "",IDC_RESY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,154,157,11,14 CONTROL "",IDC_RESY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,154,146,11,14
CONTROL "Native",IDC_NATIVERES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,130,33,10
LTEXT "Extra rendering threads:",IDC_STATIC,11,340,83,8 LTEXT "Extra rendering threads:",IDC_STATIC,11,340,83,8
EDITTEXT IDC_SWTHREADS_EDIT,94,337,35,13,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_SWTHREADS_EDIT,94,337,35,13,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,130,335,11,14 CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,130,335,11,14
COMBOBOX IDC_UPSCALE_MULTIPLIER,94,143,81,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_UPSCALE_MULTIPLIER,94,130,81,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
RTEXT "Or use Scaling:",IDC_STATIC,35,145,55,8 RTEXT "Internal Resolution:",IDC_STATIC,11,132,79,8
RTEXT "Original PS2 Resolution:",IDC_STATIC,11,130,79,8
CONTROL "Edge Anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,354,93,10 CONTROL "Edge Anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,354,93,10
PUSHBUTTON "Cancel",IDCANCEL,95,371,50,14 PUSHBUTTON "Cancel",IDCANCEL,95,371,50,14
CONTROL IDB_LOGO9,IDC_LOGO9,"Static",SS_BITMAP | SS_CENTERIMAGE,6,6,173,44 CONTROL IDB_LOGO9,IDC_LOGO9,"Static",SS_BITMAP | SS_CENTERIMAGE,6,6,173,44
CONTROL IDB_LOGOGL,IDC_LOGOGL,"Static",SS_BITMAP | SS_CENTERIMAGE,6,6,173,42 CONTROL IDB_LOGOGL,IDC_LOGOGL,"Static",SS_BITMAP | SS_CENTERIMAGE,6,6,173,42
GROUPBOX "Internal Resolution (can cause glitches)",IDC_STATIC,6,116,173,58,BS_CENTER GROUPBOX "Enhancements",IDC_STATIC,6,116,173,58,BS_CENTER
GROUPBOX "Software Mode Settings",IDC_STATIC,6,328,173,41,BS_CENTER GROUPBOX "Software Mode Settings",IDC_STATIC,6,328,173,41,BS_CENTER
GROUPBOX "Hardware Mode Settings",IDC_STATIC,6,208,173,118,BS_CENTER GROUPBOX "Hardware Mode Settings",IDC_STATIC,6,208,173,118,BS_CENTER
CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,297,58,8 CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,297,58,8

152
plugins/GSdx/resource.h
View File

@ -2,81 +2,81 @@
// Microsoft Visual C++ generated include file. // Microsoft Visual C++ generated include file.
// Used by GSdx.rc // Used by GSdx.rc
// //
#define IDC_NATIVERES 2001
#define IDC_PALTEX 2003 #define IDC_PALTEX 2001
#define IDC_LOGZ 2004 #define IDC_LOGZ 2002
#define IDC_CODECS 2006 #define IDC_CODECS 2003
#define IDC_RESOLUTION 2007 #define IDC_RESOLUTION 2004
#define IDC_RESX_EDIT 2009 #define IDC_RESX_EDIT 2005
#define IDC_RESY_EDIT 2010 #define IDC_RESY_EDIT 2006
#define IDC_AA1 2011 #define IDC_AA1 2007
#define IDC_SWTHREADS_EDIT 2012 #define IDC_SWTHREADS_EDIT 2008
#define IDC_FILTER_TEXT 2014 #define IDC_FILTER_TEXT 2009
#define IDC_FILTER 2015 #define IDC_FILTER 2010
#define IDC_DITHERING 2016 #define IDC_DITHERING 2011
#define IDC_RESX 2018 #define IDC_RESX 2012
#define IDC_RESY 2019 #define IDC_RESY 2013
#define IDD_CONFIG 2020 #define IDD_CONFIG 2014
#define IDB_LOGO9 2021 #define IDB_LOGO9 2015
#define IDB_LOGO10 2022 #define IDB_LOGO10 2016
#define IDB_LOGOGL 2023 #define IDB_LOGOGL 2017
#define IDC_FBA 2024 #define IDC_FBA 2018
#define IDC_LOGO9 2025 #define IDC_LOGO9 2019
#define IDC_LOGO11 2026 #define IDC_LOGO11 2020
#define IDC_LOGOGL 2027 #define IDC_LOGOGL 2021
#define IDD_CAPTURE 2028 #define IDD_CAPTURE 2022
#define IDD_GPUCONFIG 2029 #define IDD_GPUCONFIG 2023
#define IDC_RENDERER 2030 #define IDC_RENDERER 2024
#define IDC_INTERLACE 2031 #define IDC_INTERLACE 2025
#define IDC_ASPECTRATIO 2032 #define IDC_ASPECTRATIO 2026
#define IDC_ALPHAHACK 2033 #define IDC_ALPHAHACK 2027
#define IDC_SWTHREADS 2034 #define IDC_SWTHREADS 2028
#define IDC_SCALE 2035 #define IDC_SCALE 2029
#define IDC_UPSCALE_MULTIPLIER 2036 #define IDC_UPSCALE_MULTIPLIER 2030
#define IDC_BROWSE 2037 #define IDC_BROWSE 2031
#define IDC_OFFSETHACK 2038 #define IDC_OFFSETHACK 2032
#define IDC_FILENAME 2039 #define IDC_FILENAME 2033
#define IDC_SKIPDRAWHACK 2040 #define IDC_SKIPDRAWHACK 2034
#define IDC_WIDTH 2041 #define IDC_WIDTH 2035
#define IDC_HEIGHT 2042 #define IDC_HEIGHT 2036
#define IDC_CONFIGURE 2043 #define IDC_CONFIGURE 2037
#define IDC_ACCURATE_BLEND_UNIT_TEXT 2044 #define IDC_ACCURATE_BLEND_UNIT_TEXT 2038
#define IDC_WINDOWED 2046 #define IDC_WINDOWED 2039
#define IDC_SKIPDRAWHACKEDIT 2048 #define IDC_SKIPDRAWHACKEDIT 2040
#define IDC_SPRITEHACK 2051 #define IDC_SPRITEHACK 2041
#define IDRESET 2052 #define IDRESET 2042
#define IDC_SATURATION_SLIDER 2053 #define IDC_SATURATION_SLIDER 2043
#define IDC_BRIGHTNESS_SLIDER 2055 #define IDC_BRIGHTNESS_SLIDER 2044
#define IDC_CONTRAST_SLIDER 2056 #define IDC_CONTRAST_SLIDER 2045
#define IDC_SHADEBUTTON 2058 #define IDC_SHADEBUTTON 2046
#define IDC_SHADEBOOST 2059 #define IDC_SHADEBOOST 2047
#define IDC_HACKS_ENABLED 2060 #define IDC_HACKS_ENABLED 2048
#define IDC_SATURATION_TEXT 2061 #define IDC_SATURATION_TEXT 2049
#define IDC_BRIGHTNESS_TEXT 2062 #define IDC_BRIGHTNESS_TEXT 2050
#define IDC_CONTRAST_TEXT 2063 #define IDC_CONTRAST_TEXT 2051
#define IDC_MSAACB 2070 #define IDC_MSAACB 2052
#define IDC_HACKSBUTTON 2071 #define IDC_HACKSBUTTON 2053
#define IDC_WILDHACK 2072 #define IDC_WILDHACK 2054
#define IDC_CHECK_DISABLE_ALL_HACKS 2076 #define IDC_CHECK_DISABLE_ALL_HACKS 2055
#define IDC_ALPHASTENCIL 2077 #define IDC_ALPHASTENCIL 2056
#define IDC_ADAPTER 2078 #define IDC_ADAPTER 2057
#define IDC_TCOFFSETX 2081 #define IDC_TCOFFSETX 2058
#define IDC_TCOFFSETX2 2082 #define IDC_TCOFFSETX2 2059
#define IDC_TCOFFSETY 2083 #define IDC_TCOFFSETY 2060
#define IDC_TCOFFSETY2 2084 #define IDC_TCOFFSETY2 2061
#define IDC_FXAA 2085 #define IDC_FXAA 2062
#define IDC_SHADER_FX 2086 #define IDC_SHADER_FX 2063
#define IDC_AFCOMBO_TEXT 2087 #define IDC_AFCOMBO_TEXT 2064
#define IDC_AFCOMBO 2088 #define IDC_AFCOMBO 2065
#define IDC_OPENCL_DEVICE 2089 #define IDC_OPENCL_DEVICE 2066
#define IDC_ACCURATE_BLEND_UNIT 2090 #define IDC_ACCURATE_BLEND_UNIT 2067
#define IDC_ACCURATE_DATE 2091 #define IDC_ACCURATE_DATE 2068
#define IDC_ROUND_SPRITE 2092 #define IDC_ROUND_SPRITE 2069
#define IDC_ALIGN_SPRITE 2093 #define IDC_ALIGN_SPRITE 2070
#define IDC_CRC_LEVEL 2094 #define IDC_CRC_LEVEL 2071
#define IDC_CRC_LEVEL_TEXT 2095 #define IDC_CRC_LEVEL_TEXT 2072
#define IDC_TC_DEPTH 2096 #define IDC_TC_DEPTH 2073
#define IDC_COLORSPACE 3000 #define IDC_COLORSPACE 2075
#define IDR_CONVERT_FX 10000 #define IDR_CONVERT_FX 10000
#define IDR_TFX_FX 10001 #define IDR_TFX_FX 10001
#define IDR_MERGE_FX 10002 #define IDR_MERGE_FX 10002
@ -95,7 +95,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 10013 #define _APS_NEXT_RESOURCE_VALUE 10013
#define _APS_NEXT_COMMAND_VALUE 32771 #define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 2097 #define _APS_NEXT_CONTROL_VALUE 2074
#define _APS_NEXT_SYMED_VALUE 5000 #define _APS_NEXT_SYMED_VALUE 5000
#endif #endif
#endif #endif