1 files changed, 31 insertions, 7 deletions

diff --git a/src/gui/opengl/qopengltextureblitter.cpp b/src/gui/opengl/qopengltextureblitter.cpp
index e6dbb70618..24bdafed01 100644
--- a/src/gui/opengl/qopengltextureblitter.cpp
+++ b/src/gui/opengl/qopengltextureblitter.cpp
@@ -67,8 +67,10 @@ static const char fragment_shader150[] =
     "out vec4 fragcolor;"
     "uniform sampler2D textureSampler;"
     "uniform bool swizzle;"
+    "uniform float opacity;"
     "void main() {"
     "   vec4 tmpFragColor = texture(textureSampler, uv);"
+    "   tmpFragColor.a *= opacity;"
     "   fragcolor = swizzle ? tmpFragColor.bgra : tmpFragColor;"
     "}";
 
@@ -87,8 +89,10 @@ static const char fragment_shader[] =
     "varying highp vec2 uv;"
     "uniform sampler2D textureSampler;"
     "uniform bool swizzle;"
+    "uniform highp float opacity;"
     "void main() {"
     "   highp vec4 tmpFragColor = texture2D(textureSampler,uv);"
+    "   tmpFragColor.a *= opacity;"
     "   gl_FragColor = swizzle ? tmpFragColor.bgra : tmpFragColor;"
     "}";
 
@@ -140,6 +144,8 @@ public:
         , textureTransformUniformPos(0)
         , swizzle(false)
         , swizzleOld(false)
+        , opacity(1.0f)
+        , opacityOld(0.0f)
         , textureMatrixUniformState(User)
         , vao(new QOpenGLVertexArrayObject())
     { }
@@ -165,6 +171,11 @@ public:
             program->setUniformValue(swizzleUniformPos, swizzle);
             swizzleOld = swizzle;
         }
+
+        if (opacity != opacityOld) {
+            program->setUniformValue(opacityUniformPos, opacity);
+            opacityOld = opacity;
+        }
     }
 
     QOpenGLBuffer vertexBuffer;
@@ -175,8 +186,11 @@ public:
     GLuint textureCoordAttribPos;
     GLuint textureTransformUniformPos;
     GLuint swizzleUniformPos;
+    GLuint opacityUniformPos;
     bool swizzle;
     bool swizzleOld;
+    float opacity;
+    float opacityOld;
     TextureMatrixUniform textureMatrixUniformState;
     QScopedPointer<QOpenGLVertexArrayObject> vao;
 };
@@ -224,6 +238,7 @@ QOpenGLTextureBlitter::QOpenGLTextureBlitter()
 
 QOpenGLTextureBlitter::~QOpenGLTextureBlitter()
 {
+    destroy();
 }
 
 bool QOpenGLTextureBlitter::create()
@@ -234,9 +249,6 @@ bool QOpenGLTextureBlitter::create()
 
     Q_D(QOpenGLTextureBlitter);
 
-    d->vao->create();
-    d->vao->bind();
-
     if (d->program)
         return true;
 
@@ -259,6 +271,9 @@ bool QOpenGLTextureBlitter::create()
 
     d->program->bind();
 
+    // Create and bind the VAO, if supported.
+    QOpenGLVertexArrayObject::Binder vaoBinder(d->vao.data());
+
     d->vertexBuffer.create();
     d->vertexBuffer.bind();
     d->vertexBuffer.allocate(vertex_buffer_data, sizeof(vertex_buffer_data));
@@ -274,11 +289,10 @@ bool QOpenGLTextureBlitter::create()
     d->textureCoordAttribPos = d->program->attributeLocation("textureCoord");
     d->textureTransformUniformPos = d->program->uniformLocation("textureTransform");
     d->swizzleUniformPos = d->program->uniformLocation("swizzle");
+    d->opacityUniformPos = d->program->uniformLocation("opacity");
 
     d->program->setUniformValue(d->swizzleUniformPos,false);
 
-    d->vao->release();
-
     return true;
 }
 
@@ -290,6 +304,8 @@ bool QOpenGLTextureBlitter::isCreated() const
 
 void QOpenGLTextureBlitter::destroy()
 {
+    if (!isCreated())
+        return;
     Q_D(QOpenGLTextureBlitter);
     d->program.reset();
     d->vertexBuffer.destroy();
@@ -301,7 +317,8 @@ void QOpenGLTextureBlitter::bind()
 {
     Q_D(QOpenGLTextureBlitter);
 
-    d->vao->bind();
+    if (d->vao->isCreated())
+        d->vao->bind();
 
     d->program->bind();
 
@@ -320,7 +337,8 @@ void QOpenGLTextureBlitter::release()
 {
     Q_D(QOpenGLTextureBlitter);
     d->program->release();
-    d->vao->release();
+    if (d->vao->isCreated())
+        d->vao->release();
 }
 
 void QOpenGLTextureBlitter::setSwizzleRB(bool swizzle)
@@ -329,6 +347,12 @@ void QOpenGLTextureBlitter::setSwizzleRB(bool swizzle)
     d->swizzle = swizzle;
 }
 
+void QOpenGLTextureBlitter::setOpacity(float opacity)
+{
+    Q_D(QOpenGLTextureBlitter);
+    d->opacity = opacity;
+}
+
 void QOpenGLTextureBlitter::blit(GLuint texture,
                                  const QMatrix4x4 &targetTransform,
                                  Origin sourceOrigin)