diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-11-23 17:12:49 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-23 18:45:51 +0100 |
| commit | 417403f803c03d177c8563878e06b95a15f0d4df (patch) | |
| tree | 49a939f5a359a9b1f405801350c42aed27c08920 /src/quick | |
| parent | be197c62c09c31de2956eeb6fc11024a2c77f0ca (diff) | |
Reduce number of relocations
...by turning pointer into array variables.
Change-Id: Ia5a0cedcf28d54210cc1f179db5c519e7e0672cc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickshadereffectnode.cpp | 4 | ||||
| -rw-r--r-- | src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickshadereffectnode.cpp b/src/quick/items/qquickshadereffectnode.cpp index 7d7955c92a..622000e492 100644 --- a/src/quick/items/qquickshadereffectnode.cpp +++ b/src/quick/items/qquickshadereffectnode.cpp @@ -273,11 +273,11 @@ void QQuickCustomMaterialShader::compile() m_log += program()->log(); } - static const char *fallbackVertexShader = + static const char fallbackVertexShader[] = "uniform highp mat4 qt_Matrix;" "attribute highp vec4 v;" "void main() { gl_Position = qt_Matrix * v; }"; - static const char *fallbackFragmentShader = + static const char fallbackFragmentShader[] = "void main() { gl_FragColor = vec4(1., 0., 1., 1.); }"; if (!m_compiled) { diff --git a/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp index 393f0c73f1..40ff6a6eb0 100644 --- a/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp +++ b/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp @@ -463,7 +463,7 @@ void QSGSharedDistanceFieldGlyphCache::saveTexture(GLuint textureId, int width, glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 0, textureCoordinateArray); { - static const char *vertexShaderSource = + static const char vertexShaderSource[] = "attribute highp vec4 vertexCoordsArray; \n" "attribute highp vec2 textureCoordArray; \n" "varying highp vec2 textureCoords; \n" @@ -473,7 +473,7 @@ void QSGSharedDistanceFieldGlyphCache::saveTexture(GLuint textureId, int width, " textureCoords = textureCoordArray; \n" "} \n"; - static const char *fragmentShaderSource = + static const char fragmentShaderSource[] = "varying highp vec2 textureCoords; \n" "uniform sampler2D texture; \n" "void main() \n" |