[vlc-commits] opengl: revert some cleanup.

[Sebastien Zwickert]

vlc | branch: master | Sebastien Zwickert <dilaroga at free.fr> | Tue Sep  6 23:57:50 2011 +0200| [fc3e4b5710b0c7c684df76ef62adea967a1cf204] | committer: Felix Paul Kühne

opengl: revert some cleanup.

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

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

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

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index f33ef37..7dc67ce 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -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