diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-05-08 18:00:29 +0200 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-05-08 18:00:29 +0200 |
| commit | 3827151f19a6bd823e83708d9836abdb4bb017d4 (patch) | |
| tree | d51fae65824764da7b2c9042ebae77d46824d16b | |
| parent | ed265454d05e8583ab28b09549932721f1a65991 (diff) | |
| download | skia-linaro_android_4.0.4.tar.gz | |
skia: Fix build in ISO C++11 modelinaro_android_4.0.4
Fix macro constructs that could be mistaken for new string literals
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | gpu/src/GrGLProgram.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gpu/src/GrGLProgram.cpp b/gpu/src/GrGLProgram.cpp index ecb4753fea..47b5fd365a 100644 --- a/gpu/src/GrGLProgram.cpp +++ b/gpu/src/GrGLProgram.cpp @@ -377,7 +377,7 @@ bool GrGLProgram::genProgram(GrGLProgram::CachedData* programData) const { segments.fVSCode.append( "void main() {\n" - "\tvec3 pos3 = " VIEW_MATRIX_NAME " * vec3("POS_ATTR_NAME", 1);\n" + "\tvec3 pos3 = " VIEW_MATRIX_NAME " * vec3(" POS_ATTR_NAME ", 1);\n" "\tgl_Position = vec4(pos3.xy, 0, pos3.z);\n"); // incoming color to current stage being processed. |