1 files changed, 37 insertions, 22 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
index fcb20b4..59c50aa 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
@@ -97,6 +97,7 @@ QGLEngineSharedShaders::QGLEngineSharedShaders(const QGLContext* context)
 
         code[MainVertexShader] = qglslMainVertexShader;
         code[MainWithTexCoordsVertexShader] = qglslMainWithTexCoordsVertexShader;
+        code[MainWithTexCoordsAndOpacityVertexShader] = qglslMainWithTexCoordsAndOpacityVertexShader;
 
         code[UntransformedPositionVertexShader] = qglslUntransformedPositionVertexShader;
         code[PositionOnlyVertexShader] = qglslPositionOnlyVertexShader;
@@ -119,6 +120,7 @@ QGLEngineSharedShaders::QGLEngineSharedShaders(const QGLContext* context)
         code[MainFragmentShader_C] = qglslMainFragmentShader_C;
         code[MainFragmentShader_O] = qglslMainFragmentShader_O;
         code[MainFragmentShader] = qglslMainFragmentShader;
+        code[MainFragmentShader_ImageArrays] = qglslMainFragmentShader_ImageArrays;
 
         code[ImageSrcFragmentShader] = qglslImageSrcFragmentShader;
         code[ImageSrcWithPatternFragmentShader] = qglslImageSrcWithPatternFragmentShader;
@@ -285,6 +287,8 @@ QGLEngineShaderProg *QGLEngineSharedShaders::findProgramInCache(const QGLEngineS
     cached.program->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
     if (cached.useTextureCoords)
         cached.program->bindAttributeLocation("textureCoordArray", QT_TEXTURE_COORDS_ATTR);
+    if (cached.useOpacityAttribute)
+        cached.program->bindAttributeLocation("opacityArray", QT_OPACITY_ATTR);
 
     cached.program->link();
     if (!cached.program->isLinked()) {
@@ -331,7 +335,7 @@ QGLEngineShaderManager::QGLEngineShaderManager(QGLContext* context)
     : ctx(context),
       shaderProgNeedsChanging(true),
       srcPixelType(Qt::NoBrush),
-      useGlobalOpacity(false),
+      opacityMode(NoOpacity),
       maskType(NoMask),
       compositionMode(QPainter::CompositionMode_SourceOver),
       customSrcStage(0),
@@ -407,12 +411,12 @@ void QGLEngineShaderManager::setSrcPixelType(PixelSrcType type)
     shaderProgNeedsChanging = true; //###
 }
 
-void QGLEngineShaderManager::setUseGlobalOpacity(bool useOpacity)
+void QGLEngineShaderManager::setOpacityMode(OpacityMode mode)
 {
-    if (useGlobalOpacity == useOpacity)
+    if (opacityMode == mode)
         return;
 
-    useGlobalOpacity = useOpacity;
+    opacityMode = mode;
     shaderProgNeedsChanging = true; //###
 }
 
@@ -564,22 +568,28 @@ bool QGLEngineShaderManager::useCorrectShaderProg()
     // Choose fragment shader main function:
     QGLEngineSharedShaders::ShaderName mainFragShaderName;
 
-    if (hasCompose && hasMask && useGlobalOpacity)
-        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_CMO;
-    if (hasCompose && hasMask && !useGlobalOpacity)
-        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_CM;
-    if (!hasCompose && hasMask && useGlobalOpacity)
-        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_MO;
-    if (!hasCompose && hasMask && !useGlobalOpacity)
-        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_M;
-    if (hasCompose && !hasMask && useGlobalOpacity)
-        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_CO;
-    if (hasCompose && !hasMask && !useGlobalOpacity)
-        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_C;
-    if (!hasCompose && !hasMask && useGlobalOpacity)
-        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_O;
-    if (!hasCompose && !hasMask && !useGlobalOpacity)
-        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader;
+    if (opacityMode == AttributeOpacity) {
+        Q_ASSERT(!hasCompose && !hasMask);
+        mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_ImageArrays;
+    } else {
+        bool useGlobalOpacity = (opacityMode == UniformOpacity);
+        if (hasCompose && hasMask && useGlobalOpacity)
+            mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_CMO;
+        if (hasCompose && hasMask && !useGlobalOpacity)
+            mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_CM;
+        if (!hasCompose && hasMask && useGlobalOpacity)
+            mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_MO;
+        if (!hasCompose && hasMask && !useGlobalOpacity)
+            mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_M;
+        if (hasCompose && !hasMask && useGlobalOpacity)
+            mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_CO;
+        if (hasCompose && !hasMask && !useGlobalOpacity)
+            mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_C;
+        if (!hasCompose && !hasMask && useGlobalOpacity)
+            mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader_O;
+        if (!hasCompose && !hasMask && !useGlobalOpacity)
+            mainFragShaderName = QGLEngineSharedShaders::MainFragmentShader;
+    }
 
     requiredProgram.mainFragShader = sharedShaders->compileNamedShader(mainFragShaderName, QGLShader::PartialFragmentShader);
 
@@ -652,12 +662,17 @@ bool QGLEngineShaderManager::useCorrectShaderProg()
 
         // Choose vertex shader main function
     QGLEngineSharedShaders::ShaderName mainVertexShaderName = QGLEngineSharedShaders::InvalidShaderName;
-    if (texCoords)
+    if (opacityMode == AttributeOpacity) {
+        Q_ASSERT(texCoords);
+        mainVertexShaderName = QGLEngineSharedShaders::MainWithTexCoordsAndOpacityVertexShader;
+    } else if (texCoords) {
         mainVertexShaderName = QGLEngineSharedShaders::MainWithTexCoordsVertexShader;
-    else
+    } else {
         mainVertexShaderName = QGLEngineSharedShaders::MainVertexShader;
+    }
     requiredProgram.mainVertexShader = sharedShaders->compileNamedShader(mainVertexShaderName, QGLShader::PartialVertexShader);
     requiredProgram.useTextureCoords = texCoords;
+    requiredProgram.useOpacityAttribute = (opacityMode == AttributeOpacity);
 
 
     // At this point, requiredProgram is fully populated so try to find the program in the cache