Commit 8f80053c authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

GLwin32: fix init crash

Regression from 5989169a and ticket #7558

Close #9124
parent 7bd9d66e
...@@ -170,6 +170,11 @@ struct vout_display_opengl_t { ...@@ -170,6 +170,11 @@ struct vout_display_opengl_t {
PFNGLGETSHADERINFOLOGPROC GetShaderInfoLog; PFNGLGETSHADERINFOLOGPROC GetShaderInfoLog;
#endif #endif
#if defined(_WIN32)
PFNGLACTIVETEXTUREPROC ActiveTexture;
PFNGLCLIENTACTIVETEXTUREPROC ClientActiveTexture;
#endif
/* multitexture */ /* multitexture */
bool use_multitexture; bool use_multitexture;
...@@ -466,6 +471,13 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, ...@@ -466,6 +471,13 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
supports_shaders = false; supports_shaders = false;
#endif #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") || vgl->supports_npot = HasExtension(extensions, "GL_ARB_texture_non_power_of_two") ||
HasExtension(extensions, "GL_APPLE_texture_2D_limited_npot"); HasExtension(extensions, "GL_APPLE_texture_2D_limited_npot");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment