Wed, 31 Dec 2014 06:09:35 +0100
Cloned upstream origin tor-browser at tor-browser-31.3.0esr-4.5-1-build1
revision ID fc1c9ff7c1b2defdbc039f12214767608f46423f for hacking purpose.
1 From 3d786b1f0c040205ad9ef6d4216ce06b41f7359f Mon Sep 17 00:00:00 2001
2 From: George Wright <gw@gwright.org.uk>
3 Date: Mon, 5 Nov 2012 15:49:42 +0000
4 Subject: [PATCH 3/8] Bug 751418 - Fix compile error on gcc in Skia/GL
5 r=mattwoodrow
7 ---
8 gfx/skia/src/gpu/gl/GrGLProgram.cpp | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
11 diff --git a/gfx/skia/src/gpu/gl/GrGLProgram.cpp b/gfx/skia/src/gpu/gl/GrGLProgram.cpp
12 index 2703110..40cadc3 100644
13 --- a/gfx/skia/src/gpu/gl/GrGLProgram.cpp
14 +++ b/gfx/skia/src/gpu/gl/GrGLProgram.cpp
15 @@ -575,7 +575,7 @@ bool GrGLProgram::genProgram(const GrCustomStage** customStages) {
16 POS_ATTR_NAME);
18 builder.fVSCode.appendf("void main() {\n"
19 - "\tvec3 pos3 = %s * vec3("POS_ATTR_NAME", 1);\n"
20 + "\tvec3 pos3 = %s * vec3(" POS_ATTR_NAME ", 1);\n"
21 "\tgl_Position = vec4(pos3.xy, 0, pos3.z);\n",
22 viewMName);
24 --
25 1.7.11.7