gfx/skia/patches/archive/0013-Bug-751418-Fix-compile-error-on-gcc-in-Skia-GL-r-mat.patch@deefc01c0e14 (annotated)
gfx/skia/patches/archive/0013-Bug-751418-Fix-compile-error-on-gcc-in-Skia-GL-r-mat.patch
Thu, 15 Jan 2015 21:03:48 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 15 Jan 2015 21:03:48 +0100
- branch
- TOR_BUG_9701
- changeset 11
- deefc01c0e14
- permissions
- -rw-r--r--
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
| michael@0 | 1 | From 3d786b1f0c040205ad9ef6d4216ce06b41f7359f Mon Sep 17 00:00:00 2001 |
| michael@0 | 2 | From: George Wright <gw@gwright.org.uk> |
| michael@0 | 3 | Date: Mon, 5 Nov 2012 15:49:42 +0000 |
| michael@0 | 4 | Subject: [PATCH 3/8] Bug 751418 - Fix compile error on gcc in Skia/GL |
| michael@0 | 5 | r=mattwoodrow |
| michael@0 | 6 | |
| michael@0 | 7 | --- |
| michael@0 | 8 | gfx/skia/src/gpu/gl/GrGLProgram.cpp | 2 +- |
| michael@0 | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| michael@0 | 10 | |
| michael@0 | 11 | diff --git a/gfx/skia/src/gpu/gl/GrGLProgram.cpp b/gfx/skia/src/gpu/gl/GrGLProgram.cpp |
| michael@0 | 12 | index 2703110..40cadc3 100644 |
| michael@0 | 13 | --- a/gfx/skia/src/gpu/gl/GrGLProgram.cpp |
| michael@0 | 14 | +++ b/gfx/skia/src/gpu/gl/GrGLProgram.cpp |
| michael@0 | 15 | @@ -575,7 +575,7 @@ bool GrGLProgram::genProgram(const GrCustomStage** customStages) { |
| michael@0 | 16 | POS_ATTR_NAME); |
| michael@0 | 17 | |
| michael@0 | 18 | builder.fVSCode.appendf("void main() {\n" |
| michael@0 | 19 | - "\tvec3 pos3 = %s * vec3("POS_ATTR_NAME", 1);\n" |
| michael@0 | 20 | + "\tvec3 pos3 = %s * vec3(" POS_ATTR_NAME ", 1);\n" |
| michael@0 | 21 | "\tgl_Position = vec4(pos3.xy, 0, pos3.z);\n", |
| michael@0 | 22 | viewMName); |
| michael@0 | 23 | |
| michael@0 | 24 | -- |
| michael@0 | 25 | 1.7.11.7 |
| michael@0 | 26 |
