[vlc-commits] Made VLCGL_TEXTURE_COUNT private.

[Laurent Aimar]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Wed May 25 22:10:41 2011 +0200| [e3f41a7e6c9e514dedab258e997d3c2ba8fb92c5] | committer: Laurent Aimar

Made VLCGL_TEXTURE_COUNT private.

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

 modules/video_output/opengl.c |    6 ++++++
 modules/video_output/opengl.h |    4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index b903b73..c9c8ee6 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -76,6 +76,8 @@
 # define VLCGL_FORMAT VLCGL_RGB_FORMAT
 # define VLCGL_TYPE   VLCGL_RGB_TYPE
 
+# define VLCGL_TEXTURE_COUNT 1
+
 #elif defined(MACOS_OPENGL)
 
 /* On OS X, use GL_TEXTURE_RECTANGLE_EXT instead of GL_TEXTURE_2D.
@@ -86,6 +88,8 @@
 # define VLCGL_FORMAT GL_YCBCR_422_APPLE
 # define VLCGL_TYPE   GL_UNSIGNED_SHORT_8_8_APPLE
 
+# define VLCGL_TEXTURE_COUNT 2
+
 #else
 
 # define VLCGL_TARGET GL_TEXTURE_2D
@@ -101,6 +105,8 @@
 /* Use RGB on Win32/GLX */
 # define VLCGL_FORMAT VLCGL_RGB_FORMAT
 # define VLCGL_TYPE   VLCGL_RGB_TYPE
+
+# define VLCGL_TEXTURE_COUNT 1
 #endif
 
 struct vout_display_opengl_t {
diff --git a/modules/video_output/opengl.h b/modules/video_output/opengl.h
index 5711d17..768b9e5 100644
--- a/modules/video_output/opengl.h
+++ b/modules/video_output/opengl.h
@@ -34,8 +34,6 @@
 # define USE_OPENGL_ES 0
 #endif
 
-#define VLCGL_TEXTURE_COUNT 1
-
 #if !defined (__APPLE__)
 # if USE_OPENGL_ES == 2
 #  include <GLES2/gl2.h>
@@ -52,8 +50,6 @@
 # else
 #  define MACOS_OPENGL
 #  include <OpenGL/gl.h>
-#  undef VLCGL_TEXTURE_COUNT
-#  define VLCGL_TEXTURE_COUNT 2
 # endif
 #endif