From 565cb708757ab318da3c7998986fd10630ecbb03 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Sat, 22 Oct 2016 14:44:40 +0200 Subject: [PATCH] gsdx ogl: don't request arb_texture_barrier for the SW renderer Allow[1] to use the mesa software emulated driver to test EGL. [1] also need export MESA_EXTENSION_OVERRIDE="GL_ARB_buffer_storage" --- plugins/GSdx/GLLoader.cpp | 4 +++- plugins/GSdx/GSdx.cpp | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/GSdx/GLLoader.cpp b/plugins/GSdx/GLLoader.cpp index d4876f37c3..16460b6381 100644 --- a/plugins/GSdx/GLLoader.cpp +++ b/plugins/GSdx/GLLoader.cpp @@ -21,6 +21,7 @@ #include "stdafx.h" #include "GLLoader.h" #include "GSdx.h" +#include "GS.h" PFNGLBLENDCOLORPROC gl_BlendColor = NULL; @@ -338,6 +339,7 @@ namespace GLLoader { } bool status = true; + bool mandatory_hw = static_cast(theApp.GetConfigI("Renderer")) == GSRendererType::OGL_HW; // Bonus status &= status_and_override(found_GL_EXT_texture_filter_anisotropic, "GL_EXT_texture_filter_anisotropic"); @@ -360,7 +362,7 @@ namespace GLLoader { // GL4.5 status &= status_and_override(found_GL_ARB_clip_control, "GL_ARB_clip_control", true); status &= status_and_override(found_GL_ARB_direct_state_access, "GL_ARB_direct_state_access", true); - status &= status_and_override(found_GL_ARB_texture_barrier, "GL_ARB_texture_barrier", true); + status &= status_and_override(found_GL_ARB_texture_barrier, "GL_ARB_texture_barrier", mandatory_hw); status &= status_and_override(found_GL_ARB_get_texture_sub_image, "GL_ARB_get_texture_sub_image"); #ifdef _WIN32 diff --git a/plugins/GSdx/GSdx.cpp b/plugins/GSdx/GSdx.cpp index ed225a8475..d2b74246bb 100644 --- a/plugins/GSdx/GSdx.cpp +++ b/plugins/GSdx/GSdx.cpp @@ -314,6 +314,7 @@ void GSdxApp::Init() m_default_configuration["override_GL_ARB_gpu_shader5"] = "-1"; m_default_configuration["override_GL_ARB_shader_image_load_store"] = "-1"; m_default_configuration["override_GL_ARB_viewport_array"] = "-1"; + m_default_configuration["override_GL_ARB_texture_barrier"] = "-1"; m_default_configuration["override_GL_EXT_texture_filter_anisotropic"] = "-1"; m_default_configuration["paltex"] = "0"; m_default_configuration["png_compression_level"] = to_string(Z_BEST_SPEED);