Changeset 846 for trunk/src/opengl/gl2paintengineex/qglengineshadermanager_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/opengl/gl2paintengineex/qglengineshadermanager_p.h (modified) (8 diffs)

trunk/src/opengl/gl2paintengineex/qglengineshadermanager_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -73 +73 @@
     calculations which logically belong in the fragment shader have been moved
     into the vertex shader to improve performance. This is why the position
-    calculation is in a seperate shader. Not only does it calculate the
+    calculation is in a separate shader. Not only does it calculate the
     position, but it also calculates some data to be passed to the fragment
     shader as a varying. It is optimal to move as much of the calculation as
@@ -273 +273 @@
         UntransformedPositionVertexShader,
         PositionOnlyVertexShader,
+        ComplexGeometryPositionOnlyVertexShader,
         PositionWithPatternBrushVertexShader,
         PositionWithLinearGradientBrushVertexShader,
@@ -401 +402 @@
     bool                useTextureCoords;
     bool                useOpacityAttribute;
-    bool                usePmvMatrix;
+    bool                usePmvMatrixAttribute;
 
     bool operator==(const QGLEngineShaderProg& other) {
@@ -447 +448 @@
         BrushTransform,
         BrushTexture,
+        Matrix,
         NumUniforms
     };
@@ -456 +458 @@
     };
 
-    // There are optimisations we can do, depending on the brush transform:
+    // There are optimizations we can do, depending on the brush transform:
     //    1) May not have to apply perspective-correction
     //    2) Can use lower precision for matrix
@@ -475 +477 @@
     void useSimpleProgram();
     void useBlitProgram();
+    void setHasComplexGeometry(bool hasComplexGeometry)
+    {
+        complexGeometry = hasComplexGeometry;
+        shaderProgNeedsChanging = true;
+    }
+    bool hasComplexGeometry() const
+    {
+        return complexGeometry;
+    }
 
     QGLShaderProgram* currentProgram(); // Returns pointer to the shader the manager has chosen
@@ -488 +499 @@
     QGLContext*     ctx;
     bool            shaderProgNeedsChanging;
+    bool            complexGeometry;
 
     // Current state variables which influence the choice of shader: