[vlc-commits] Improved "non power of 2" texture support detection (opengl).

[Laurent Aimar]

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

Improved "non power of 2" texture support detection (opengl).

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

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

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 6cae30c..752fe82 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -190,10 +190,9 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
     supports_npot = true;
 #elif defined(MACOS_OPENGL)
     supports_npot = true;
-#endif
-
-#if defined(__APPLE__) && USE_OPENGL_ES == 1
-    supports_npot |= strstr(extensions, "GL_APPLE_texture_2D_limited_npot") != NULL;
+#else
+    supports_npot |= strstr(extensions, "GL_APPLE_texture_2D_limited_npot") != NULL ||
+                     strstr(extensions, "GL_ARB_texture_non_power_of_two");
 #endif
 
     /* Texture size */