gl: set uniform values only when they are changed

src/OpenGLVideo.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************
-    QtAV:  Media play library based on Qt and FFmpeg
+    QtAV:  Multimedia framework based on Qt and FFmpeg
     Copyright (C) 2012-2016 Wang Bin <[email protected]>
 
 *   This file is part of QtAV (from 2014)
@@ -370,7 +370,6 @@ void OpenGLVideo::render(const QRectF &target, const QRectF& roi, const QMatrix4
     if (!shader)
         shader = d.manager->prepareMaterial(d.material, mt); //TODO: print shader type name if changed. prepareMaterial(,sample_code, pp_code)
     shader->update(d.material);
-    shader->program()->setUniformValue(shader->opacityLocation(), (GLfloat)1.0);
     shader->program()->setUniformValue(shader->matrixLocation(), transform*d.matrix);
     // uniform end. attribute begin
     d.bindAttributes(shader, target, roi);

src/QtAV/OpenGLVideo.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-    QtAV:  Media play library based on Qt and FFmpeg
+    QtAV:  Multimedia framework based on Qt and FFmpeg
     Copyright (C) 2012-2016 Wang Bin <[email protected]>
 
 *   This file is part of QtAV (from 2014)

src/QtAV/private/VideoShader_p.h

@@ -51,6 +51,7 @@ class Q_AV_PRIVATE_EXPORT VideoShaderPrivate : public DPtrPrivate<VideoShader>
     VideoShaderPrivate()
         : owns_program(false)
         , rebuild_program(false)
+        , update_builtin_uniforms(true)
         , program(0)
         , u_Matrix(-1)
         , u_colorMatrix(-1)
@@ -73,6 +74,7 @@ class Q_AV_PRIVATE_EXPORT VideoShaderPrivate : public DPtrPrivate<VideoShader>
 
     bool owns_program; // shader program is not created by this. e.g. scene graph create it's own program and we store it here
     bool rebuild_program;
+    bool update_builtin_uniforms; //builtin uniforms are static, set the values once is enough if no change
     QOpenGLShaderProgram *program;
     int u_Matrix;
     int u_colorMatrix;

src/VideoShader.cpp

@@ -354,6 +354,7 @@ void VideoShader::initialize(QOpenGLShaderProgram *shaderProgram)
         }
     }
     d.rebuild_program = false;
+    d.update_builtin_uniforms = true;
 }
 
 int VideoShader::textureLocationCount() const
@@ -461,19 +462,23 @@ bool VideoShader::update(VideoMaterial *material)
     setVideoFormat(fmt);
     // uniforms begin
     program()->bind(); //glUseProgram(id). for glUniform
+    setUserUniformValues();
+    if (!d.update_builtin_uniforms)
+        return true;
+    d.update_builtin_uniforms = false;
     // all texture ids should be binded when renderering even for packed plane!
     const int nb_planes = fmt.planeCount(); //number of texture id
+    // TODO: sample2D array
     for (int i = 0; i < nb_planes; ++i) {
         // use glUniform1i to swap planes. swap uv: i => (3-i)%3
-        // TODO: in shader, use uniform sample2D u_Texture[], and use glUniform1iv(u_Texture, 3, {...})
         program()->setUniformValue(textureLocation(i), (GLint)i);
     }
     if (nb_planes < textureLocationCount()) {
         for (int i = nb_planes; i < textureLocationCount(); ++i) {
             program()->setUniformValue(textureLocation(i), (GLint)(nb_planes - 1));
         }
     }
-    //qDebug() << "color mat " << material->colorMatrix();
+    program()->setUniformValue(opacityLocation(), (GLfloat)1.0);
     program()->setUniformValue(colorMatrixLocation(), material->colorMatrix());
     if (d_func().u_to8 >= 0)
         program()->setUniformValue(d_func().u_to8, material->vectorTo8bit());
@@ -482,7 +487,6 @@ bool VideoShader::update(VideoMaterial *material)
     //program()->setUniformValue(matrixLocation(), material->matrix()); //what about sgnode? state.combindMatrix()?
     if (texelSizeLocation() >= 0)
         program()->setUniformValueArray(texelSizeLocation(), material->texelSize().constData(), nb_planes);
-    setUserUniformValues();
     // uniform end. attribute begins
     return true;
 }