diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-02 16:05:53 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-02 16:05:53 (GMT) |
| commit | 0981f27d76436f8058d8534b7454777910922ee0 (patch) | |
| tree | 780a864cb0d9b163f15dbe9d84e64bb0dfbb9110 /src/opengl/gl2paintengineex/qglengineshadersource_p.h | |
| parent | e658bcb0e64acca9684f0897510d639af98ab552 (diff) | |
| parent | 5a26fa6da1986bdb507391fd8784c51258e81d80 (diff) | |
| download | Qt-0981f27d76436f8058d8534b7454777910922ee0.zip Qt-0981f27d76436f8058d8534b7454777910922ee0.tar.gz Qt-0981f27d76436f8058d8534b7454777910922ee0.tar.bz2 | |
Merge commit 'origin/4.6' into mmfphonon
Conflicts:
demos/mediaplayer/mediaplayer.pro
Diffstat (limited to 'src/opengl/gl2paintengineex/qglengineshadersource_p.h')
| -rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadersource_p.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadersource_p.h b/src/opengl/gl2paintengineex/qglengineshadersource_p.h index 8ae86d3..6712bf6 100644 --- a/src/opengl/gl2paintengineex/qglengineshadersource_p.h +++ b/src/opengl/gl2paintengineex/qglengineshadersource_p.h @@ -84,6 +84,20 @@ static const char* const qglslMainWithTexCoordsVertexShader = "\ textureCoords = textureCoordArray; \ }"; +static const char* const qglslMainWithTexCoordsAndOpacityVertexShader = "\ + attribute highp vec2 textureCoordArray; \ + attribute lowp float opacityArray; \ + varying highp vec2 textureCoords; \ + varying lowp float opacity; \ + uniform highp float depth; \ + void setPosition(); \ + void main(void) \ + { \ + setPosition(); \ + gl_Position.z = depth * gl_Position.w; \ + textureCoords = textureCoordArray; \ + opacity = opacityArray; \ + }"; static const char* const qglslPositionOnlyVertexShader = "\ attribute highp vec4 vertexCoordsArray;\ @@ -331,6 +345,12 @@ static const char* const qglslShockingPinkSrcFragmentShader = "\ return vec4(0.98, 0.06, 0.75, 1.0); \ }"; +static const char* const qglslMainFragmentShader_ImageArrays = "\ + varying lowp float opacity; \ + lowp vec4 srcPixel(); \ + void main() { \ + gl_FragColor = srcPixel() * opacity; \ + }"; static const char* const qglslMainFragmentShader_CMO = "\ uniform lowp float globalOpacity; \ |