Changeset 769 for trunk/src/opengl/gl2paintengineex/qglengineshadermanager.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/opengl/gl2paintengineex/qglengineshadermanager.cpp (modified) (2 diffs)

trunk/src/opengl/gl2paintengineex/qglengineshadermanager.cpp

@@ -266 +266 @@
     do {
         QByteArray source;
+
+
+
+
         source.append(qShaderSnippets[prog.mainFragShader]);
         source.append(qShaderSnippets[prog.srcPixelFragShader]);
-        if (prog.srcPixelFragShader == CustomImageSrcFragmentShader)
-            source.append(prog.customStageSource);
         if (prog.compositionFragShader)
             source.append(qShaderSnippets[prog.compositionFragShader]);
@@ -766 +768 @@
     QGLContextPrivate* ctx_d = ctx->d_func();
     ctx_d->setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, true);
-    ctx_d->setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, currentShaderProg->useTextureCoords);
-    ctx_d->setVertexAttribArrayEnabled(QT_OPACITY_ATTR, currentShaderProg->useOpacityAttribute);
+    ctx_d->setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, currentShaderProg->useTextureCoords);
+    ctx_d->setVertexAttribArrayEnabled(QT_OPACITY_ATTR, currentShaderProg->useOpacityAttribute);
 
     shaderProgNeedsChanging = false;