Modified: trunk/Source/WebCore/ChangeLog (142391 => 142392)
--- trunk/Source/WebCore/ChangeLog 2013-02-10 10:00:29 UTC (rev 142391)
+++ trunk/Source/WebCore/ChangeLog 2013-02-10 10:40:34 UTC (rev 142392)
@@ -1,3 +1,19 @@
+2013-02-10 Zan Dobersek <zdober...@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 <pnorm...@igalia.com>
[GStreamer] audio is muted when playback rate is between 0.8 and 2.0
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp (142391 => 142392)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp 2013-02-10 10:00:29 UTC (rev 142391)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp 2013-02-10 10:40:34 UTC (rev 142392)
@@ -73,10 +73,10 @@
void TextureMapperShaderProgram::setMatrix(GC3Duint location, const TransformationMatrix& matrix)
{
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())
};
m_context->uniformMatrix4fv(location, 1, false, matrixAsFloats);
