[vlc-commits] GLwin32: fix init crash

[Jean-Baptiste Kempf]

vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Aug  8 16:26:52 2013 +0200| [3131e3799e46d5592b535fc87223e6869243f1b7] | committer: Jean-Baptiste Kempf

GLwin32: fix init crash

Regression from 5989169 and ticket #7558

Close #9124

(cherry picked from commit 2e76e9077af6865e12c9a137c6d1b66234cf8881)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=3131e3799e46d5592b535fc87223e6869243f1b7
---

 modules/video_output/opengl.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 0941805..030183d 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -170,6 +170,11 @@ struct vout_display_opengl_t {
     PFNGLGETSHADERINFOLOGPROC GetShaderInfoLog;
 #endif
 
+#if defined(_WIN32)
+    PFNGLACTIVETEXTUREPROC  ActiveTexture;
+    PFNGLCLIENTACTIVETEXTUREPROC  ClientActiveTexture;
+#endif
+
 
     /* multitexture */
     bool use_multitexture;
@@ -466,6 +471,13 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
         supports_shaders = false;
 #endif
 
+#if defined(_WIN32)
+    vgl->ActiveTexture = (PFNGLACTIVETEXTUREPROC)vlc_gl_GetProcAddress(vgl->gl, "glActiveTexture");
+    vgl->ClientActiveTexture = (PFNGLCLIENTACTIVETEXTUREPROC)vlc_gl_GetProcAddress(vgl->gl, "glClientActiveTexture");
+#   define glActiveTexture vgl->ActiveTexture
+#   define glClientActiveTexture vgl->ClientActiveTexture
+#endif
+
     vgl->supports_npot = HasExtension(extensions, "GL_ARB_texture_non_power_of_two") ||
                          HasExtension(extensions, "GL_APPLE_texture_2D_limited_npot");