Fix issue with DSO.

EXT and ARB extensions have bit different signatures.
Disable DSO black list for now.

4 files changed, 25 insertions, 19 deletions

diff --git a/src/render/opengl/mgl.hpp b/src/render/opengl/mgl.hpp
index 1d8a33f3c..7bc2fa5e8 100644
--- a/src/render/opengl/mgl.hpp
+++ b/src/render/opengl/mgl.hpp
@@ -134,6 +134,7 @@ defName(glDeleteQueries);
 defName(glGetQueryObjectiv);
 defName(glGetQueryObjectui64v);
 defName(glTextureSubImage2D);
+defName(glTextureSubImage2DEXT);
 defName(glClearTexImage);
 defName(glClearTexSubImage);
 #ifdef WIN32
diff --git a/src/render/opengl/mglemu.cpp b/src/render/opengl/mglemu.cpp
index 80bc36d6a..297dae3e1 100644
--- a/src/render/opengl/mglemu.cpp
+++ b/src/render/opengl/mglemu.cpp
@@ -26,12 +26,12 @@
 
 #include "debug.h"
 
-void APIENTRY emuglTextureSubImage2D(GLuint texture, GLenum target,
-                                     GLint level,
-                                     GLint xoffset, GLint yoffset,
-                                     GLsizei width, GLsizei height,
-                                     GLenum format, GLenum type,
-                                     const void *pixels)
+void APIENTRY emuglTextureSubImage2DEXT(GLuint texture, GLenum target,
+                                        GLint level,
+                                        GLint xoffset, GLint yoffset,
+                                        GLsizei width, GLsizei height,
+                                        GLenum format, GLenum type,
+                                        const void *pixels)
 {
     OpenGLImageHelper::bindTexture(texture);
     glTexSubImage2D(target, level,
diff --git a/src/render/opengl/mglemu.h b/src/render/opengl/mglemu.h
index 1ae73d67c..eb291dafd 100644
--- a/src/render/opengl/mglemu.h
+++ b/src/render/opengl/mglemu.h
@@ -24,16 +24,16 @@
 
 #include "render/opengl/mgltypes.h"
 
-void APIENTRY emuglTextureSubImage2D(GLuint texture,
-                                     GLenum target,
-                                     GLint level,
-                                     GLint xoffset,
-                                     GLint yoffset,
-                                     GLsizei width,
-                                     GLsizei height,
-                                     GLenum format,
-                                     GLenum type,
-                                     const void *pixels);
+void APIENTRY emuglTextureSubImage2DEXT(GLuint texture,
+                                        GLenum target,
+                                        GLint level,
+                                        GLint xoffset,
+                                        GLint yoffset,
+                                        GLsizei width,
+                                        GLsizei height,
+                                        GLenum format,
+                                        GLenum type,
+                                        const void *pixels);
 
 void APIENTRY emuglActiveTexture(GLenum texture);
 
diff --git a/src/render/opengl/mgltypes.h b/src/render/opengl/mgltypes.h
index 96f86bde3..2d02979d4 100644
--- a/src/render/opengl/mgltypes.h
+++ b/src/render/opengl/mgltypes.h
@@ -187,9 +187,14 @@ typedef void (APIENTRY *glGetQueryObjectiv_t) (GLuint id,
     GLenum pname, GLint *params);
 typedef void (APIENTRY *glGetQueryObjectui64v_t) (GLuint id,
     GLenum pname, uint64_t *params);
-typedef void (APIENTRY *glTextureSubImage2D_t) (GLuint texture, GLenum target,
-    GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height,
-    GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRY *glTextureSubImage2DEXT_t) (GLuint texture,
+    GLenum target, GLint level, GLint xoffset, GLint yoffset,
+    GLsizei width, GLsizei height, GLenum format, GLenum type,
+    const void *pixels);
+typedef void (APIENTRY *glTextureSubImage2D_t) (GLuint texture,
+    GLint level, GLint xoffset, GLint yoffset,
+    GLsizei width, GLsizei height, GLenum format, GLenum type,
+    const void *pixels);
 typedef void (APIENTRY *glClearTexImage_t) (GLuint texture, GLint level,
     GLenum format, GLenum type, const void * data);
 typedef void (APIENTRY *glClearTexSubImage_t) (GLuint texture, GLint level,