diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 16:06:10 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 16:14:55 +0300 |
commit | 2f1a518d4572bdad2cacd8e8bc25df93acffa9b4 (patch) | |
tree | 7529956ac00a3789a4aa3310fd6c80518a6773f5 /libvo/vo_gl.c | |
parent | 9b68a49d0132bbe08d3a9bf7a19276801ac415aa (diff) | |
parent | d852b590a2aefad3c2050cf2741b4c51af8735ca (diff) | |
download | mpv-2f1a518d4572bdad2cacd8e8bc25df93acffa9b4.tar.bz2 mpv-2f1a518d4572bdad2cacd8e8bc25df93acffa9b4.tar.xz |
Merge svn changes up to r31211
The merged cache2.c changes are known to have problems. Will merge
further fixes to them before merging this to the master branch.
Diffstat (limited to 'libvo/vo_gl.c')
-rw-r--r-- | libvo/vo_gl.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index efec18564b..c52ceabb5d 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -503,12 +503,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) |