Commit e3f41a7e authored by Laurent Aimar's avatar Laurent Aimar

Made VLCGL_TEXTURE_COUNT private.

parent 32792812
......@@ -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 {
......
......@@ -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
......
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