diff options
author | jmarshallnz <jmarshallnz@svn> | 2010-06-16 21:36:46 +0000 |
---|---|---|
committer | jmarshallnz <jmarshallnz@svn> | 2010-06-16 21:36:46 +0000 |
commit | 6be31d3e23636afcf6350dc8df4de5a18ac79af6 (patch) | |
tree | aec60a8848d19c5465fbe53fdf01a51cece872a5 /system/shaders | |
parent | 1afc5900309239252786dc73ca931e7796901f9e (diff) |
fixed: GLES blending performance enhancements and color fixes. Ticket #9351, thanks to Phaeodaria.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@31128 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'system/shaders')
-rw-r--r-- | system/shaders/guishader_frag1.glsl | 3 | ||||
-rw-r--r-- | system/shaders/guishader_frag4.glsl | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/system/shaders/guishader_frag1.glsl b/system/shaders/guishader_frag1.glsl index 73c6f3929f..4f5cad7b4a 100644 --- a/system/shaders/guishader_frag1.glsl +++ b/system/shaders/guishader_frag1.glsl @@ -6,7 +6,8 @@ varying vec4 m_cord1; varying vec4 m_colour; uniform int m_method; +// SM_TEXTURE void main () { - gl_FragColor.rgba = texture2D(m_samp0, m_cord0.xy).bgra; + gl_FragColor.rgba = vec4(texture2D(m_samp0, m_cord0.xy).bgra * m_colour); } diff --git a/system/shaders/guishader_frag4.glsl b/system/shaders/guishader_frag4.glsl new file mode 100644 index 0000000000..2a1d62eb2c --- /dev/null +++ b/system/shaders/guishader_frag4.glsl @@ -0,0 +1,13 @@ +precision mediump float;
+uniform sampler2D m_samp0;
+uniform sampler2D m_samp1;
+varying vec4 m_cord0;
+varying vec4 m_cord1;
+varying vec4 m_colour;
+uniform int m_method;
+
+// SM_TEXTURE_NOBLEND
+void main ()
+{
+ gl_FragColor.rgba = vec4(texture2D(m_samp0, m_cord0.xy).bgra);
+}
|