Changeset 142392 in webkit

Timestamp:

Feb 10, 2013 2:40:34 AM (11 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK] Build errors in TextureMapperShaderProgram.cpp when compiling with Clang
​https://bugs.webkit.org/show_bug.cgi?id=109321

Patch by Zan Dobersek <​zdobersek@igalia.com> on 2013-02-10
Reviewed by Noam Rosenthal.

Clang is reporting errors due to non-constant expressions that cannot be narrowed
from double to float type in initializer list when constructing a matrix of GC3Dfloat
numbers. To avoid this every parameter is passed through an explicit GC3Dfloat constructor.

No new tests - no new functionality.

• platform/graphics/texmap/TextureMapperShaderProgram.cpp:

(WebCore::TextureMapperShaderProgram::setMatrix):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/TextureMapperShaderProgram.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-10  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Build errors in TextureMapperShaderProgram.cpp when compiling with Clang
+        https://bugs.webkit.org/show_bug.cgi?id=109321
+
+        Reviewed by Noam Rosenthal.
+
+        Clang is reporting errors due to non-constant expressions that cannot be narrowed
+        from double to float type in initializer list when constructing a matrix of GC3Dfloat
+        numbers. To avoid this every parameter is passed through an explicit GC3Dfloat constructor.
+
+        No new tests - no new functionality.
+
+        * platform/graphics/texmap/TextureMapperShaderProgram.cpp:
+        (WebCore::TextureMapperShaderProgram::setMatrix):
+
 2013-02-10  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp

@@ -74 +74 @@
 {
     GC3Dfloat matrixAsFloats[] = {
-        matrix.m11(), matrix.m12(), matrix.m13(), matrix.m14(),
-        matrix.m21(), matrix.m22(), matrix.m23(), matrix.m24(),
-        matrix.m31(), matrix.m32(), matrix.m33(), matrix.m34(),
-        matrix.m41(), matrix.m42(), matrix.m43(), matrix.m44()
+        GC3Dfloat(matrix.m11()), GC3Dfloat(matrix.m12()), GC3Dfloat(matrix.m13()), GC3Dfloat(matrix.m14()),
+        GC3Dfloat(matrix.m21()), GC3Dfloat(matrix.m22()), GC3Dfloat(matrix.m23()), GC3Dfloat(matrix.m24()),
+        GC3Dfloat(matrix.m31()), GC3Dfloat(matrix.m32()), GC3Dfloat(matrix.m33()), GC3Dfloat(matrix.m34()),
+        GC3Dfloat(matrix.m41()), GC3Dfloat(matrix.m42()), GC3Dfloat(matrix.m43()), GC3Dfloat(matrix.m44())
     };