From 3009c1eff42a747959255492a69b9235de271b2c Mon Sep 17 00:00:00 2001 From: reimar Date: Mon, 24 May 2010 17:36:23 +0000 Subject: Fix OpenGL autodetection to not leave values at -1. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31207 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_gl.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'libvo/vo_gl.c') diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 815fa27555..37ccd796de 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -487,12 +487,19 @@ static void autodetectGlExtensions(void) { 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) -- cgit v1.2.3