yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[kwin/backgroundcontrast] Fix shader on GLSL 1.10 code path

Browse source 
We need to use the varying_in/out variables, the code was a little
bit too modern.

At the same time remove the identity matrix and replace it by mat4(1.0).

Note: the shader should probably go into glsl files as they are not
really generated.
This commit is contained in:
Martin Gräßlin 2014-01-23 15:44:12 +01:00
parent f2acaa2826
commit daf0772c35
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
effects/backgroundcontrast/contrastshader.cpp
View file

@ -176,7 +176,7 @@ void ContrastShader::init()
stream << "uniform mat4 modelViewProjectionMatrix;\n"; stream << "uniform mat4 modelViewProjectionMatrix;\n";
stream << "uniform mat4 textureMatrix;\n"; stream << "uniform mat4 textureMatrix;\n";
stream << attribute << " vec4 vertex;\n\n"; stream << attribute << " vec4 vertex;\n\n";
stream << "out vec4 varyingTexCoords;\n"; stream << varying_out << " vec4 varyingTexCoords;\n";
stream << "\n"; stream << "\n";
stream << "void main(void)\n"; stream << "void main(void)\n";
stream << "{\n"; stream << "{\n";
@ -196,7 +196,7 @@ void ContrastShader::init()
stream2 << "uniform mat4 colorMatrix;\n"; stream2 << "uniform mat4 colorMatrix;\n";
stream2 << "uniform sampler2D sampler;\n"; stream2 << "uniform sampler2D sampler;\n";
stream2 << "uniform float opacity;\n"; stream2 << "uniform float opacity;\n";
stream2 << "in vec4 varyingTexCoords;\n"; stream2 << varying_in << " vec4 varyingTexCoords;\n";
if (glsl_140) if (glsl_140)
stream2 << "out vec4 fragColor;\n\n"; stream2 << "out vec4 fragColor;\n\n";
@ -204,15 +204,11 @@ void ContrastShader::init()
stream2 << "void main(void)\n"; stream2 << "void main(void)\n";
stream2 << "{\n"; stream2 << "{\n";
stream2 << " vec4 tex = " << texture2D << "(sampler, varyingTexCoords.st);\n"; stream2 << " vec4 tex = " << texture2D << "(sampler, varyingTexCoords.st);\n";
stream2 << " mat4 identity = mat4(1.0, 0.0, 0.0, 0.0,\n";
stream2 << " 0.0, 1.0, 0.0, 0.0,\n";
stream2 << " 0.0, 0.0, 1.0, 0.0,\n";
stream2 << " 0.0, 0.0, 0.0, 1.0);\n";
stream2 << " if (opacity >= 1.0) {\n"; stream2 << " if (opacity >= 1.0) {\n";
stream2 << " " << fragColor << " = tex * colorMatrix;\n"; stream2 << " " << fragColor << " = tex * colorMatrix;\n";
stream2 << " } else {\n"; stream2 << " } else {\n";
stream2 << " " << fragColor << " = tex * (opacity * colorMatrix + (1-opacity) * identity);\n"; stream2 << " " << fragColor << " = tex * (opacity * colorMatrix + (1.0 - opacity) * mat4(1.0));\n";
stream2 << " }\n"; stream2 << " }\n";
stream2 << "}\n"; stream2 << "}\n";