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

gsdx-ogl: drop GL_NV_depth_clamp extension 

superseeded by GL_ARB_clip_control
This commit is contained in:
Gregory Hainaut 2014-09-15 22:28:35 +02:00
parent 4659184cc1
commit 9d8d702aa6
5 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/GSdx/GLLoader.cpp
View File

@ -118,8 +118,6 @@ PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC gl_MakeTextureHandleNonResidentARB = NU
PFNGLUNIFORMHANDLEUI64VARBPROC gl_UniformHandleui64vARB = NULL; PFNGLUNIFORMHANDLEUI64VARBPROC gl_UniformHandleui64vARB = NULL;
PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC gl_ProgramUniformHandleui64vARB = NULL; PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC gl_ProgramUniformHandleui64vARB = NULL;
PFNGLDEPTHRANGEDNVPROC gl_DepthRangedNV = NULL;
// GL4.5 // GL4.5
PFNGLCREATETEXTURESPROC gl_CreateTextures = NULL; PFNGLCREATETEXTURESPROC gl_CreateTextures = NULL;
PFNGLTEXTURESTORAGE2DPROC gl_TextureStorage2D = 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_image_load_store = false; // GLES3.1
bool found_GL_ARB_shader_subroutine = false; bool found_GL_ARB_shader_subroutine = false;
bool found_GL_ARB_bindless_texture = false; // GL5 GPU? 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) // GL4.5 for the future (dx10/dx11 compatibility)
bool found_GL_ARB_clip_control = false; bool found_GL_ARB_clip_control = false;
@ -312,7 +308,9 @@ namespace GLLoader {
#endif #endif
#ifdef GLBINDLESS // Need to debug the code first #ifdef GLBINDLESS // Need to debug the code first
if (ext.compare("GL_ARB_bindless_texture") == 0) found_GL_ARB_bindless_texture = true; 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 #ifdef ENABLE_GLES
fprintf(stderr, "DEBUG ext: %s\n", ext.c_str()); 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_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_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"); status &= status_and_override(found_GL_ARB_clip_control, "GL_ARB_clip_control");
// Mandatory extension in DSA mode // Mandatory extension in DSA mode

3
plugins/GSdx/GLLoader.h
View File

@ -302,8 +302,6 @@ extern PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC gl_MakeTextureHandleNonResidentA
extern PFNGLUNIFORMHANDLEUI64VARBPROC gl_UniformHandleui64vARB; extern PFNGLUNIFORMHANDLEUI64VARBPROC gl_UniformHandleui64vARB;
extern PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC gl_ProgramUniformHandleui64vARB; extern PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC gl_ProgramUniformHandleui64vARB;
extern PFNGLDEPTHRANGEDNVPROC gl_DepthRangedNV;
// GL4.5 // GL4.5
extern PFNGLCREATETEXTURESPROC gl_CreateTextures; extern PFNGLCREATETEXTURESPROC gl_CreateTextures;
extern PFNGLTEXTURESTORAGE2DPROC gl_TextureStorage2D; extern PFNGLTEXTURESTORAGE2DPROC gl_TextureStorage2D;
@ -435,7 +433,6 @@ namespace GLLoader {
extern bool found_GL_ARB_shader_subroutine; extern bool found_GL_ARB_shader_subroutine;
extern bool found_GL_ARB_bindless_texture; extern bool found_GL_ARB_bindless_texture;
extern bool found_GL_ARB_explicit_uniform_location; 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_clip_control;
extern bool found_GL_ARB_direct_state_access; extern bool found_GL_ARB_direct_state_access;
} }

2
plugins/GSdx/GSDeviceOGL.cpp
View File

@ -321,8 +321,6 @@ bool GSDeviceOGL::Create(GSWnd* wnd)
if (GLLoader::found_GL_ARB_clip_control) { if (GLLoader::found_GL_ARB_clip_control) {
// Change depth convention // Change depth convention
gl_ClipControl(GL_LOWER_LEFT, GL_ZERO_TO_ONE); 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 #endif

2
plugins/GSdx/GSShaderOGL.cpp
View File

@ -403,7 +403,7 @@ std::string GSShaderOGL::GenGlslHeader(const std::string& entry, GLenum type, co
header += "#define ENABLE_BINDLESS_TEX\n"; 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"; header += "#define ZERO_TO_ONE_DEPTH\n";
} }

2
plugins/GSdx/GSWnd.cpp
View File

@ -121,8 +121,6 @@ void GSWndGL::PopulateGlFunction()
*(void**)&(gl_UniformHandleui64vARB) = GetProcAddress("glUniformHandleui64vARB", true); *(void**)&(gl_UniformHandleui64vARB) = GetProcAddress("glUniformHandleui64vARB", true);
*(void**)&(gl_ProgramUniformHandleui64vARB) = GetProcAddress("glProgramUniformHandleui64vARB", true); *(void**)&(gl_ProgramUniformHandleui64vARB) = GetProcAddress("glProgramUniformHandleui64vARB", true);
*(void**)&(gl_DepthRangedNV) = GetProcAddress("glDepthRangedNV", true);
// GL4.5 // GL4.5
*(void**)&(gl_CreateTextures) = GetProcAddress("glCreateTextures", true); *(void**)&(gl_CreateTextures) = GetProcAddress("glCreateTextures", true);
*(void**)&(gl_TextureStorage2D) = GetProcAddress("glTextureStorage2D", true); *(void**)&(gl_TextureStorage2D) = GetProcAddress("glTextureStorage2D", true);