diff --git a/plugins/GSdx/GSLinuxDialog.cpp b/plugins/GSdx/GSLinuxDialog.cpp index 0e9d9d77c6..62a3d73789 100644 --- a/plugins/GSdx/GSLinuxDialog.cpp +++ b/plugins/GSdx/GSLinuxDialog.cpp @@ -395,7 +395,6 @@ void populate_shader_table(GtkWidget* shader_table) void populate_hack_table(GtkWidget* hack_table) { GtkWidget* hack_alpha_check = CreateCheckBox("Alpha Hack", "UserHacks_AlphaHack"); - GtkWidget* hack_date_check = CreateCheckBox("Date Hack", "UserHacks_DateGL4"); GtkWidget* hack_offset_check = CreateCheckBox("Offset Hack", "UserHacks_HalfPixelOffset"); GtkWidget* hack_skipdraw_label = gtk_label_new("Skipdraw:"); GtkWidget* hack_skipdraw_spin = CreateSpinButton(0, 1000, "UserHacks_SkipDraw"); @@ -413,8 +412,8 @@ void populate_hack_table(GtkWidget* hack_table) GtkWidget* stretch_hack_label = gtk_label_new("Align Sprite Texture:"); // Reuse windows helper string :) + gtk_widget_set_tooltip_text(auto_skip_check, dialog_message(IDC_AUTO_SKIP)); gtk_widget_set_tooltip_text(hack_alpha_check, dialog_message(IDC_ALPHAHACK)); - gtk_widget_set_tooltip_text(hack_date_check, "Disable opengl barrier for performance with DATE operation"); gtk_widget_set_tooltip_text(hack_offset_check, dialog_message(IDC_TCOFFSETX)); gtk_widget_set_tooltip_text(hack_skipdraw_label, dialog_message(IDC_SKIPDRAWHACK)); gtk_widget_set_tooltip_text(hack_skipdraw_spin, dialog_message(IDC_SKIPDRAWHACK)); @@ -433,9 +432,8 @@ void populate_hack_table(GtkWidget* hack_table) s_table_line = 0; InsertWidgetInTable(hack_table , hack_enble_check); InsertWidgetInTable(hack_table , hack_alpha_check , hack_offset_check); - InsertWidgetInTable(hack_table , hack_logz_check , hack_date_check); + InsertWidgetInTable(hack_table , hack_logz_check , auto_skip_check); InsertWidgetInTable(hack_table , hack_wild_check , align_sprite_check); - InsertWidgetInTable(hack_table , auto_skip_check); InsertWidgetInTable(hack_table , hack_sprite_label , hack_sprite_box ); InsertWidgetInTable(hack_table , stretch_hack_label , stretch_hack_box ); InsertWidgetInTable(hack_table , hack_skipdraw_label , hack_skipdraw_spin); diff --git a/plugins/GSdx/GSRendererOGL.cpp b/plugins/GSdx/GSRendererOGL.cpp index 04691d14e1..830c55b5fa 100644 --- a/plugins/GSdx/GSRendererOGL.cpp +++ b/plugins/GSdx/GSRendererOGL.cpp @@ -35,7 +35,6 @@ GSRendererOGL::GSRendererOGL() UserHacks_AlphaHack = theApp.GetConfig("UserHacks_AlphaHack", 0); UserHacks_AlphaStencil = theApp.GetConfig("UserHacks_AlphaStencil", 0); - UserHacks_DateGL4 = theApp.GetConfig("UserHacks_DateGL4", 0); UserHacks_TCOffset = theApp.GetConfig("UserHacks_TCOffset", 0); UserHacks_TCO_x = (UserHacks_TCOffset & 0xFFFF) / -1000.0f; UserHacks_TCO_y = ((UserHacks_TCOffset >> 16) & 0xFFFF) / -1000.0f; @@ -43,7 +42,6 @@ GSRendererOGL::GSRendererOGL() if (!theApp.GetConfig("UserHacks", 0)) { UserHacks_AlphaHack = false; UserHacks_AlphaStencil = false; - UserHacks_DateGL4 = false; UserHacks_TCOffset = 0; UserHacks_TCO_x = 0; UserHacks_TCO_y = 0; @@ -690,8 +688,7 @@ void GSRendererOGL::DrawPrims(GSTexture* rt, GSTexture* ds, GSTextureCache::Sour dev->SetupPS(ps_sel); // Be sure that first pass is finished ! - if (!UserHacks_DateGL4) - dev->Barrier(GL_SHADER_IMAGE_ACCESS_BARRIER_BIT); + dev->Barrier(GL_SHADER_IMAGE_ACCESS_BARRIER_BIT); GL_POP(); } diff --git a/plugins/GSdx/GSRendererOGL.h b/plugins/GSdx/GSRendererOGL.h index 5e2781cf82..e1cf6ee39d 100644 --- a/plugins/GSdx/GSRendererOGL.h +++ b/plugins/GSdx/GSRendererOGL.h @@ -37,7 +37,6 @@ class GSRendererOGL : public GSRendererHW bool UserHacks_AlphaHack; bool UserHacks_AlphaStencil; - bool UserHacks_DateGL4; unsigned int UserHacks_TCOffset; float UserHacks_TCO_x, UserHacks_TCO_y;