Implemented QGLTextureGlyphCache to avoid wasting glyph cache memory.

Now there's only a copy of the texture glyph cache in graphics memory,
avoiding the system memory copy that we used earlier. In addition the
texture will use the GL_ALPHA texture format when possible, making it
consume less graphics memory as well.

Reviewed-by: Tom

1 files changed, 7 insertions, 2 deletions

diff --git a/src/opengl/gl2paintengineex/qglengineshadersource_p.h b/src/opengl/gl2paintengineex/qglengineshadersource_p.h
index fdbba723c9..920d0bcc1a 100644
--- a/src/opengl/gl2paintengineex/qglengineshadersource_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadersource_p.h
@@ -89,6 +89,12 @@ static const char* const qglslPositionOnlyVertexShader = "\
             gl_Position = pmvMatrix * vertexCoordsArray;\
     }";
 
+static const char* const qglslUntransformedPositionVertexShader = "\
+    attribute highp vec4    vertexCoordsArray;\
+    void setPosition(void)\
+    {\
+            gl_Position = vertexCoordsArray;\
+    }";
 
 // Pattern Brush - This assumes the texture size is 8x8 and thus, the inverted size is 0.125
 static const char* const qglslPositionWithPatternBrushVertexShader = "\
@@ -354,7 +360,7 @@ static const char* const qglslMaskFragmentShader = "\
     lowp vec4 applyMask(lowp vec4 src) \
     {\
         lowp vec4 mask = texture2D(maskTexture, textureCoords); \
-        return src * mask.r; \
+        return src * mask.a; \
     }";
 
 /*
@@ -375,7 +381,6 @@ static const char* const qglslMaskFragmentShader = "\
         ExclusionCompositionModeFragmentShader,
 */
 
-
 QT_END_NAMESPACE
 
 QT_END_HEADER