[vlc-commits] opengl: fix win32 build

Rafaël Carré git at videolan.org
Tue Oct 30 14:27:55 CET 2012


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Oct 30 11:09:25 2012 +0100| [9aef14d5e54f06229a11dbccccd5805482734a18] | committer: Rafaël Carré

opengl: fix win32 build

it is not clear how glew(Active)ClientTexture should be acceeded,
do not use the broken glew 'shortcut' for these functions

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9aef14d5e54f06229a11dbccccd5805482734a18
---

 modules/video_output/opengl.h |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/video_output/opengl.h b/modules/video_output/opengl.h
index f3e9372..a513ef3 100644
--- a/modules/video_output/opengl.h
+++ b/modules/video_output/opengl.h
@@ -55,6 +55,10 @@
 # else
 #  ifdef WIN32
 #   include <GL/glew.h>
+#   undef glClientActiveTexture
+#   undef glActiveTexture
+    PFNGLACTIVETEXTUREPROC glActiveTexture;
+    PFNGLCLIENTACTIVETEXTUREPROC glClientActiveTexture;
 #  endif
 #  include <GL/gl.h>
 # endif



More information about the vlc-commits mailing list