Skip to content
Browse files

gles: fix YV12 rendering (FIXUP e6e434f).

  • Loading branch information...
1 parent 3609c7e commit f249e652379a063164ee1ccf421c30bd1d37d07f @gbeauchesne committed Sep 5, 2012
Showing with 2 additions and 14 deletions.
  1. +2 −14 system/shaders/yuv2rgb_basic_gles.glsl
View
16 system/shaders/yuv2rgb_basic_gles.glsl
@@ -31,19 +31,7 @@ uniform mat4 m_yuvmat;
void main()
{
-#if defined(XBMC_YV12)
-
- vec4 yuv, rgb;
- yuv.rgba = vec4( texture2D(m_sampY, m_cordY).r
- , texture2D(m_sampU, m_cordU).g
- , texture2D(m_sampV, m_cordV).a
- , 1.0 );
-
- rgb = m_yuvmat * yuv;
- rgb.a = m_alpha;
- gl_FragColor = rgb;
-
-#elif defined(XBMC_Y_UV)
+#if defined(XBMC_Y_UV)
vec4 yuv, rgb;
yuv.rgba = vec4( texture2D(m_sampY, m_cordY).r
@@ -55,7 +43,7 @@ void main()
rgb.a = m_alpha;
gl_FragColor = rgb;
-#elif defined(XBMC_Y_U_V)
+#elif defined(XBMC_Y_U_V) || defined(XBMC_YV12)
vec4 yuv, rgb;
yuv.rgba = vec4( texture2D(m_sampY, m_cordY).r

0 comments on commit f249e65

Please sign in to comment.
Something went wrong with that request. Please try again.