Mercurial > mplayer.hg

changeset 31150:7886a9ada88e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix OpenGL autodetection to not leave values at -1.
author reimar
date Mon, 24 May 2010 17:36:23 +0000
parents 8b1a6a6cda36
children 944efc839c41
files libvo/vo_gl.c
diffstat 1 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_gl.c	Sun May 23 23:24:25 2010 +0000
+++ b/libvo/vo_gl.c	Mon May 24 17:36:23 2010 +0000
@@ -487,12 +487,19 @@
     ati_broken_pbo = ver && ver < 8395;
   }
   if (ati_hack      == -1) ati_hack      = ati_broken_pbo;
-  if (force_pbo     == -1 && extensions && strstr(extensions, "_pixel_buffer_object"))
-    force_pbo = is_ati;
-  if (use_rectangle == -1 && extensions && strstr(extensions, "_texture_non_power_of_two"))
+  if (force_pbo     == -1) {
+    force_pbo = 0;
+    if (extensions && strstr(extensions, "_pixel_buffer_object"))
+      force_pbo = is_ati;
+  }
+  if (use_rectangle == -1) {
     use_rectangle = 0;
-  if (use_rectangle == -1 && extensions && strstr(extensions, "_texture_rectangle"))
-    use_rectangle = renderer && strstr(renderer, "Mesa DRI R200") ? 1 : 0;
+    if (extensions) {
+//      if (strstr(extensions, "_texture_non_power_of_two"))
+      if (strstr(extensions, "_texture_rectangle"))
+        use_rectangle = renderer && strstr(renderer, "Mesa DRI R200") ? 1 : 0;
+    }
+  }
   if (use_osd == -1)
     use_osd = mpglBindTexture != NULL;
   if (use_yuv == -1)