[vlc-commits] opengl: re-enable the mac part by default

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Sep  7 17:58:50 2011 +0200| [86348530937d437db420a2168ec1e230952e9d4d] | committer: Felix Paul Kühne

opengl: re-enable the mac part by default

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

 modules/video_output/opengl.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 7dc67ce..e33f7f5 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -208,7 +208,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
     vgl->tex_format   = GL_RGB;
     vgl->tex_internal = GL_RGB;
     vgl->tex_type     = GL_UNSIGNED_SHORT_5_6_5;
-#elif defined(BROKEN_MACOS_OPENGL)
+#elif defined(MACOS_OPENGL)
 #   if defined(WORDS_BIGENDIAN)
     vgl->fmt.i_chroma = VLC_CODEC_YUYV;
 #   else
@@ -272,7 +272,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
     bool supports_npot = false;
 #if USE_OPENGL_ES == 2
     supports_npot = true;
-#elif defined(BROKEN_MACOS_OPENGL)
+#elif defined(MACOS_OPENGL)
     supports_npot = true;
 #else
     supports_npot |= HasExtension(extensions, "GL_APPLE_texture_2D_limited_npot") ||
@@ -395,7 +395,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
     *fmt = vgl->fmt;
     if (subpicture_chromas) {
         *subpicture_chromas = NULL;
-#if !defined(BROKEN_MACOS_OPENGL) && !USE_OPENGL_ES
+#if !defined(MACOS_OPENGL) && !USE_OPENGL_ES
         if (supports_npot)
             *subpicture_chromas = gl_subpicture_chromas;
 #endif
@@ -428,7 +428,7 @@ void vout_display_opengl_Delete(vout_display_opengl_t *vgl)
     free(vgl);
 }
 
-#ifdef BROKEN_MACOS_OPENGL
+#ifdef MACOS_OPENGL
 struct picture_sys_t {
     vout_display_opengl_t *vgl;
     GLuint *texture;
@@ -477,7 +477,7 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned
         if (!picture[count])
             break;
 
-#ifdef BROKEN_MACOS_OPENGL
+#ifdef MACOS_OPENGL
         picture_sys_t *sys = picture[count]->p_sys = malloc(sizeof(*sys));
         if (sys) {
             sys->vgl = vgl;
@@ -493,7 +493,7 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned
     memset(&cfg, 0, sizeof(cfg));
     cfg.picture_count = count;
     cfg.picture       = picture;
-#ifdef BROKEN_MACOS_OPENGL
+#ifdef MACOS_OPENGL
     cfg.lock          = PictureLock;
     cfg.unlock        = PictureUnlock;
 #endif
@@ -524,7 +524,7 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned
             glTexParameteri(vgl->tex_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
             glTexParameteri(vgl->tex_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
-#ifdef BROKEN_MACOS_OPENGL
+#ifdef MACOS_OPENGL
             /* Tell the driver not to make a copy of the texture but to use
                our buffer */
             glEnable(GL_UNPACK_CLIENT_STORAGE_APPLE);
@@ -576,7 +576,7 @@ int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
     if (vlc_gl_Lock(vgl->gl))
         return VLC_EGENERIC;
 
-#ifdef BROKEN_MACOS_OPENGL
+#ifdef MACOS_OPENGL
     /* Bind to the texture for drawing */
     glBindTexture(vgl->tex_target, PictureGetTexture(picture));
 #else
@@ -738,7 +738,7 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 #else
-#if !defined(BROKEN_MACOS_OPENGL)
+#if !defined(MACOS_OPENGL)
     for (unsigned j = 0; j < vgl->chroma->plane_count; j++) {
         if (vgl->use_multitexture)
             vgl->ActiveTextureARB(GL_TEXTURE0_ARB + j);