]> git.sesse.net Git - vlc/commitdiff
opengl: revert some cleanup.
authorSebastien Zwickert <dilaroga@free.fr>
Tue, 6 Sep 2011 21:57:50 +0000 (23:57 +0200)
committerFelix Paul Kühne <fkuehne@videolan.org>
Wed, 7 Sep 2011 09:14:30 +0000 (11:14 +0200)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
modules/video_output/opengl.c

index f33ef37992da4508cb1c5eb901beb89a628288e3..7dc67ceea20562b1bd953af2c624a663d5cb3c88 100644 (file)
@@ -272,6 +272,8 @@ 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)
+    supports_npot = true;
 #else
     supports_npot |= HasExtension(extensions, "GL_APPLE_texture_2D_limited_npot") ||
                      HasExtension(extensions, "GL_ARB_texture_non_power_of_two");
@@ -393,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 !USE_OPENGL_ES
+#if !defined(BROKEN_MACOS_OPENGL) && !USE_OPENGL_ES
         if (supports_npot)
             *subpicture_chromas = gl_subpicture_chromas;
 #endif