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

gsdx-linux: drop the logz option 

logz will only enabled if GL_ARB_clip_control is not found.

Note: logz will likely break depth support. Be sure to use a recent driver
This commit is contained in:
Gregory Hainaut 2015-07-03 21:29:49 +02:00
parent 82ed6eac13
commit 621d1d93db
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/GSdx/GSLinuxDialog.cpp
View File

@ -403,7 +403,6 @@ void populate_hack_table(GtkWidget* hack_table)
GtkWidget* hack_wild_check = CreateCheckBox("Wild arm Hack", "UserHacks_WildHack"); GtkWidget* hack_wild_check = CreateCheckBox("Wild arm Hack", "UserHacks_WildHack");
GtkWidget* hack_tco_label = gtk_label_new("Texture Offset: 0x"); GtkWidget* hack_tco_label = gtk_label_new("Texture Offset: 0x");
GtkWidget* hack_tco_entry = CreateTextBox("UserHacks_TCOffset"); GtkWidget* hack_tco_entry = CreateTextBox("UserHacks_TCOffset");
GtkWidget* hack_logz_check = CreateCheckBox("Log Depth Hack", "logz", true);
GtkWidget* align_sprite_check = CreateCheckBox("Align sprite hack", "UserHacks_align_sprite_X"); GtkWidget* align_sprite_check = CreateCheckBox("Align sprite hack", "UserHacks_align_sprite_X");
GtkWidget* hack_sprite_box = CreateComboBoxFromVector(theApp.m_gs_hack, "UserHacks_SpriteHack"); GtkWidget* hack_sprite_box = CreateComboBoxFromVector(theApp.m_gs_hack, "UserHacks_SpriteHack");
@ -421,7 +420,6 @@ void populate_hack_table(GtkWidget* hack_table)
gtk_widget_set_tooltip_text(hack_sprite_label, dialog_message(IDC_SPRITEHACK)); gtk_widget_set_tooltip_text(hack_sprite_label, dialog_message(IDC_SPRITEHACK));
gtk_widget_set_tooltip_text(hack_tco_label, dialog_message(IDC_TCOFFSETX)); gtk_widget_set_tooltip_text(hack_tco_label, dialog_message(IDC_TCOFFSETX));
gtk_widget_set_tooltip_text(hack_tco_entry, dialog_message(IDC_TCOFFSETX)); gtk_widget_set_tooltip_text(hack_tco_entry, dialog_message(IDC_TCOFFSETX));
gtk_widget_set_tooltip_text(hack_logz_check, "Use a logarithmic depth instead of a linear depth (superseded by ARB_clip_control)");
gtk_widget_set_tooltip_text(align_sprite_check, dialog_message(IDC_ALIGN_SPRITE)); gtk_widget_set_tooltip_text(align_sprite_check, dialog_message(IDC_ALIGN_SPRITE));
gtk_widget_set_tooltip_text(stretch_hack_box, dialog_message(IDC_ROUND_SPRITE)); gtk_widget_set_tooltip_text(stretch_hack_box, dialog_message(IDC_ROUND_SPRITE));
gtk_widget_set_tooltip_text(stretch_hack_label, dialog_message(IDC_ROUND_SPRITE)); gtk_widget_set_tooltip_text(stretch_hack_label, dialog_message(IDC_ROUND_SPRITE));
@ -429,11 +427,11 @@ void populate_hack_table(GtkWidget* hack_table)
s_table_line = 0; s_table_line = 0;
InsertWidgetInTable(hack_table , hack_enble_check); InsertWidgetInTable(hack_table , hack_enble_check);
InsertWidgetInTable(hack_table , hack_logz_check , hack_offset_check);
InsertWidgetInTable(hack_table , hack_wild_check , align_sprite_check); InsertWidgetInTable(hack_table , hack_wild_check , align_sprite_check);
InsertWidgetInTable(hack_table , hack_sprite_label , hack_sprite_box ); InsertWidgetInTable(hack_table , hack_sprite_label , hack_sprite_box );
InsertWidgetInTable(hack_table , stretch_hack_label , stretch_hack_box ); InsertWidgetInTable(hack_table , stretch_hack_label , stretch_hack_box );
InsertWidgetInTable(hack_table , hack_skipdraw_label , hack_skipdraw_spin); InsertWidgetInTable(hack_table , hack_skipdraw_label , hack_skipdraw_spin);
InsertWidgetInTable(hack_table , hack_offset_check);
InsertWidgetInTable(hack_table , hack_tco_label , hack_tco_entry); InsertWidgetInTable(hack_table , hack_tco_label , hack_tco_entry);
} }

12
plugins/GSdx/GSTextureFXOGL.cpp
View File

@ -42,23 +42,13 @@ void GSDeviceOGL::CreateTextureFX()
// It might cost a seconds at startup but it would reduce benchmark pollution // It might cost a seconds at startup but it would reduce benchmark pollution
m_gs = CompileGS(); m_gs = CompileGS();
int logz = theApp.GetConfig("logz", 1);
// Don't do it in debug build, so it can still be tested
#ifndef _DEBUG
if (GLLoader::found_GL_ARB_clip_control && logz) {
fprintf(stderr, "Your driver supports advance depth. Logz will be disabled\n");
logz = 0;
} else if (!GLLoader::found_GL_ARB_clip_control && !logz) {
fprintf(stderr, "Your driver DOESN'T support advance depth (GL_ARB_clip_control)\n It is higly recommmended to enable logz\n");
}
#endif
for (uint32 key = 0; key < VSSelector::size(); key++) { for (uint32 key = 0; key < VSSelector::size(); key++) {
// wildhack is only useful if both TME and FST are enabled. // wildhack is only useful if both TME and FST are enabled.
VSSelector sel(key); VSSelector sel(key);
if (sel.wildhack && (!sel.tme || !sel.fst)) if (sel.wildhack && (!sel.tme || !sel.fst))
m_vs[key] = 0; m_vs[key] = 0;
else else
m_vs[key] = CompileVS(sel, logz); m_vs[key] = CompileVS(sel, !GLLoader::found_GL_ARB_clip_control);
} }
// Enable all bits for stencil operations. Technically 1 bit is // Enable all bits for stencil operations. Technically 1 bit is