diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 15:27:58 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 15:27:58 +0300 |
| commit | 6f199ab3d97a1a5831f261fd5fc46d592ae1cdff (patch) | |
| tree | a785da88f8fc1ffd73619d528bfac70a795d2f51 /libvo | |
| parent | 18657beb190b3e4acc6404c3b87e6eafbd22de3c (diff) | |
| parent | 8c9cb24a48373330e9bfd4568eb7987890b19f8f (diff) | |
| download | mpv-6f199ab3d97a1a5831f261fd5fc46d592ae1cdff.tar.bz2 mpv-6f199ab3d97a1a5831f261fd5fc46d592ae1cdff.tar.xz | |
Merge svn changes up to r31169
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/fastmemcpy.h | 2 | ||||
| -rw-r--r-- | libvo/vo_gl.c | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h index a28f495486..f03287564f 100644 --- a/libvo/fastmemcpy.h +++ b/libvo/fastmemcpy.h @@ -27,7 +27,7 @@ void * fast_memcpy(void * to, const void * from, size_t len); void * mem2agpcpy(void * to, const void * from, size_t len); -#if ! defined(CONFIG_FASTMEMCPY) && ! (HAVE_MMX || HAVE_MMX2 || HAVE_AMD3DNOW /* || HAVE_SSE || HAVE_SSE2 */) +#if ! defined(CONFIG_FASTMEMCPY) || ! (HAVE_MMX || HAVE_MMX2 || HAVE_AMD3DNOW /* || HAVE_SSE || HAVE_SSE2 */) #define mem2agpcpy(a,b,c) memcpy(a,b,c) #define fast_memcpy(a,b,c) memcpy(a,b,c) #endif diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index cf796a9661..efec18564b 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -129,7 +129,7 @@ static int osd_color; static int use_aspect; static int use_ycbcr; #define MASK_ALL_YUV (~(1 << YUV_CONVERSION_NONE)) -#define MASK_NOT_COMBINERS (~((1 << YUV_CONVERSION_NONE) | (1 << YUV_CONVERSION_COMBINERS) | (1 << YUV_CONVERSION_COMBINERS_ATI))) +#define MASK_NOT_COMBINERS (~((1 << YUV_CONVERSION_NONE) | (1 << YUV_CONVERSION_COMBINERS))) #define MASK_GAMMA_SUPPORT (MASK_NOT_COMBINERS & ~(1 << YUV_CONVERSION_FRAGMENT)) static int use_yuv; static int colorspace; @@ -503,10 +503,12 @@ static void autodetectGlExtensions(void) { ati_broken_pbo = ver && ver < 8395; } if (ati_hack == -1) ati_hack = ati_broken_pbo; - if (extensions && force_pbo == -1) - force_pbo = strstr(extensions, "_pixel_buffer_object") ? is_ati : 0; - if (extensions && use_rectangle == -1) - use_rectangle = strstr(extensions, "_texture_non_power_of_two") ? 0 : 0; + 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")) + use_rectangle = 0; + if (use_rectangle == -1 && extensions && 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) |