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

Merge pull request #3640 from Sonicadvance1/glextensions_workaround_trash 

Disable some OpenGL 4.5 functions until AMD fixes their trash driver.
This commit is contained in:
Pierre Bourdon 2016-02-16 15:41:48 +01:00
parent 2c5fcad5f5 d4dfbbf214
commit d4b67be288
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Source/Core/Common/GL/GLExtensions/GLExtensions.cpp
View File

@ -1817,26 +1817,28 @@ const GLFunc gl_function_array[] =
GLFUNC_REQUIRES(glGetTextureSubImage, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetCompressedTextureSubImage, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetGraphicsResetStatus, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnCompressedTexImage, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnTexImage, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnUniformdv, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnUniformfv, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnUniformiv, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnUniformuiv, "VERSION_4_5"),
GLFUNC_REQUIRES(glReadnPixels, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnMapdv, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnMapfv, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnMapiv, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnPixelMapfv, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnPixelMapuiv, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnPixelMapusv, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnPolygonStipple, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnColorTable, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnConvolutionFilter, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnSeparableFilter, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnHistogram, "VERSION_4_5"),
GLFUNC_REQUIRES(glGetnMinmax, "VERSION_4_5"),
GLFUNC_REQUIRES(glTextureBarrier, "VERSION_4_5"),
// AMD's video driver is trash and doesn't expose these function pointers
// Remove them for now until they learn how to implement the spec properly.
// GLFUNC_REQUIRES(glGetnCompressedTexImage, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnTexImage, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnUniformdv, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnUniformfv, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnUniformiv, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnUniformuiv, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnMapdv, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnMapfv, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnMapiv, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnPixelMapfv, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnPixelMapuiv, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnPixelMapusv, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnPolygonStipple, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnColorTable, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnConvolutionFilter, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnSeparableFilter, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnHistogram, "VERSION_4_5"),
// GLFUNC_REQUIRES(glGetnMinmax, "VERSION_4_5"),
// ARB_uniform_buffer_object
GLFUNC_REQUIRES(glGetActiveUniformName, "GL_ARB_uniform_buffer_object"),
@ -2010,7 +2012,7 @@ const GLFunc gl_function_array[] =
// ARB_buffer_storage
GLFUNC_REQUIRES(glBufferStorage, "GL_ARB_buffer_storage !VERSION_4_4"),
GLFUNC_REQUIRES(glNamedBufferStorage, "GL_ARB_buffer_storage GL_EXT_direct_state_access !VERSION_4_5"),
GLFUNC_SUFFIX(glNamedBufferStorage, EXT, "GL_ARB_buffer_storage GL_EXT_direct_state_access !VERSION_4_5"),
// EXT_buffer_storage
GLFUNC_SUFFIX(glBufferStorage, EXT, "GL_EXT_buffer_storage !GL_ARB_buffer_storage !VERSION_4_4"),