diff --git a/plugins/GSdx/GLLoader.cpp b/plugins/GSdx/GLLoader.cpp index d0a1d017a44e8..6d061944cec45 100644 --- a/plugins/GSdx/GLLoader.cpp +++ b/plugins/GSdx/GLLoader.cpp @@ -118,8 +118,6 @@ PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC gl_MakeTextureHandleNonResidentARB = NU PFNGLUNIFORMHANDLEUI64VARBPROC gl_UniformHandleui64vARB = NULL; PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC gl_ProgramUniformHandleui64vARB = NULL; -PFNGLDEPTHRANGEDNVPROC gl_DepthRangedNV = NULL; - // GL4.5 PFNGLCREATETEXTURESPROC gl_CreateTextures = NULL; PFNGLTEXTURESTORAGE2DPROC gl_TextureStorage2D = NULL; @@ -173,8 +171,6 @@ namespace GLLoader { bool found_GL_ARB_shader_image_load_store = false; // GLES3.1 bool found_GL_ARB_shader_subroutine = false; bool found_GL_ARB_bindless_texture = false; // GL5 GPU? - // Surely recent hardware - bool found_GL_NV_depth_buffer_float = false; // GL4.5 for the future (dx10/dx11 compatibility) bool found_GL_ARB_clip_control = false; @@ -312,7 +308,9 @@ namespace GLLoader { #endif #ifdef GLBINDLESS // Need to debug the code first if (ext.compare("GL_ARB_bindless_texture") == 0) found_GL_ARB_bindless_texture = true; -#endif + // GL4.5 + if (ext.compare("GL_ARB_direct_state_access") == 0) found_GL_ARB_direct_state_access = true; + if (ext.compare("GL_ARB_clip_control") == 0) found_GL_ARB_clip_control = true; #ifdef ENABLE_GLES fprintf(stderr, "DEBUG ext: %s\n", ext.c_str()); @@ -343,7 +341,6 @@ namespace GLLoader { status &= status_and_override(found_GL_ARB_multi_bind,"GL_ARB_multi_bind"); status &= status_and_override(found_GL_ARB_bindless_texture,"GL_ARB_bindless_texture"); - status &= status_and_override(found_GL_NV_depth_buffer_float,"GL_NV_depth_buffer_float"); status &= status_and_override(found_GL_ARB_clip_control, "GL_ARB_clip_control"); // Mandatory extension in DSA mode diff --git a/plugins/GSdx/GLLoader.h b/plugins/GSdx/GLLoader.h index 9992139a0b1ac..fdbc7c3178c72 100644 --- a/plugins/GSdx/GLLoader.h +++ b/plugins/GSdx/GLLoader.h @@ -302,8 +302,6 @@ extern PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC gl_MakeTextureHandleNonResidentA extern PFNGLUNIFORMHANDLEUI64VARBPROC gl_UniformHandleui64vARB; extern PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC gl_ProgramUniformHandleui64vARB; -extern PFNGLDEPTHRANGEDNVPROC gl_DepthRangedNV; - // GL4.5 extern PFNGLCREATETEXTURESPROC gl_CreateTextures; extern PFNGLTEXTURESTORAGE2DPROC gl_TextureStorage2D; @@ -435,7 +433,6 @@ namespace GLLoader { extern bool found_GL_ARB_shader_subroutine; extern bool found_GL_ARB_bindless_texture; extern bool found_GL_ARB_explicit_uniform_location; - extern bool found_GL_NV_depth_buffer_float; extern bool found_GL_ARB_clip_control; extern bool found_GL_ARB_direct_state_access; } diff --git a/plugins/GSdx/GSDeviceOGL.cpp b/plugins/GSdx/GSDeviceOGL.cpp index 2b8fa0fc43ecf..b9eacceeb77b2 100644 --- a/plugins/GSdx/GSDeviceOGL.cpp +++ b/plugins/GSdx/GSDeviceOGL.cpp @@ -321,8 +321,6 @@ bool GSDeviceOGL::Create(GSWnd* wnd) if (GLLoader::found_GL_ARB_clip_control) { // Change depth convention gl_ClipControl(GL_LOWER_LEFT, GL_ZERO_TO_ONE); - } else if (GLLoader::found_GL_NV_depth_buffer_float) { - gl_DepthRangedNV(-1.0f, 1.0f); } #endif diff --git a/plugins/GSdx/GSShaderOGL.cpp b/plugins/GSdx/GSShaderOGL.cpp index ec5a76e9fb740..77587cc75686d 100644 --- a/plugins/GSdx/GSShaderOGL.cpp +++ b/plugins/GSdx/GSShaderOGL.cpp @@ -403,7 +403,7 @@ std::string GSShaderOGL::GenGlslHeader(const std::string& entry, GLenum type, co header += "#define ENABLE_BINDLESS_TEX\n"; } - if (GLLoader::found_GL_NV_depth_buffer_float || GLLoader::found_GL_ARB_clip_control) { + if (GLLoader::found_GL_ARB_clip_control) { header += "#define ZERO_TO_ONE_DEPTH\n"; } diff --git a/plugins/GSdx/GSWnd.cpp b/plugins/GSdx/GSWnd.cpp index a11dff9da04aa..41aa4fbca18ff 100644 --- a/plugins/GSdx/GSWnd.cpp +++ b/plugins/GSdx/GSWnd.cpp @@ -121,8 +121,6 @@ void GSWndGL::PopulateGlFunction() *(void**)&(gl_UniformHandleui64vARB) = GetProcAddress("glUniformHandleui64vARB", true); *(void**)&(gl_ProgramUniformHandleui64vARB) = GetProcAddress("glProgramUniformHandleui64vARB", true); - *(void**)&(gl_DepthRangedNV) = GetProcAddress("glDepthRangedNV", true); - // GL4.5 *(void**)&(gl_CreateTextures) = GetProcAddress("glCreateTextures", true); *(void**)&(gl_TextureStorage2D) = GetProcAddress("glTextureStorage2D", true);