summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-04-24 22:13:57 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-04-24 22:13:57 +0000
commitf81cd34fe0f145702ac225f13c5de7007b9d7320 (patch)
tree3fd51c7b5a0cb81d79bfe2e2203a6dab975253f6 /libvo
parentd5d3c203d3b0681c724c2ea1c170c06b97aa31ad (diff)
downloadmpv-f81cd34fe0f145702ac225f13c5de7007b9d7320.tar.bz2
mpv-f81cd34fe0f145702ac225f13c5de7007b9d7320.tar.xz
Add workaroound for yuv=7 mode - does hurt speed but not much
and this code should only be used when it is the only option. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31068 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/gl_common.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c
index 8cdc42766a..a25a3ba9d4 100644
--- a/libvo/gl_common.c
+++ b/libvo/gl_common.c
@@ -1510,12 +1510,16 @@ void glDisableYUVConversion(GLenum target, int type) {
mpglDisable(GL_FRAGMENT_SHADER_ATI);
break;
case YUV_CONVERSION_TEXT_FRAGMENT:
+ mpglDisable(GL_TEXT_FRAGMENT_SHADER_ATI);
+ // HACK: at least the 10.5 Radeon drivers are broken
+ // and without this disable the texture units while
+ // the program is still running
+ mpglFlush();
mpglActiveTexture(GL_TEXTURE1);
mpglDisable(target);
mpglActiveTexture(GL_TEXTURE2);
mpglDisable(target);
mpglActiveTexture(GL_TEXTURE0);
- mpglDisable(GL_TEXT_FRAGMENT_SHADER_ATI);
break;
case YUV_CONVERSION_FRAGMENT_LOOKUP3D:
case YUV_CONVERSION_FRAGMENT_LOOKUP: