Attachment #187358 for bug #109321

View Details Raw Unified Return to Bug 109321

| Differences between



2013-02-08  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 NOBODY (OOPS!).

        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 inline function that casts
        the value from the double type to the GC3Dfloat one.

        No new tests - no new functionality.

        * platform/graphics/texmap/TextureMapperShaderProgram.cpp:
        (WebCore::asGC3Dfloat):
        (WebCore):
        (WebCore::TextureMapperShaderProgram::setMatrix):

2013-02-08  Dean Jackson  <dino@apple.com>

        Put snapshotting label text into localizable strings



    LOG(Compositing, "Program log: %s\n", log.utf8().data());
}

static inline GC3Dfloat asGC3Dfloat(double value)
{
    return static_cast<GC3Dfloat>(value);
}

void TextureMapperShaderProgram::setMatrix(GC3Duint location, const TransformationMatrix& matrix)
{
    GC3Dfloat matrixAsFloats[] = {
        asGC3Dfloat(matrix.m11()), asGC3Dfloat(matrix.m12()), asGC3Dfloat(matrix.m13()), asGC3Dfloat(matrix.m14()),
        asGC3Dfloat(matrix.m21()), asGC3Dfloat(matrix.m22()), asGC3Dfloat(matrix.m23()), asGC3Dfloat(matrix.m24()),
        asGC3Dfloat(matrix.m31()), asGC3Dfloat(matrix.m32()), asGC3Dfloat(matrix.m33()), asGC3Dfloat(matrix.m34()),
        asGC3Dfloat(matrix.m41()), asGC3Dfloat(matrix.m42()), asGC3Dfloat(matrix.m43()), asGC3Dfloat(matrix.m44())
    };

    m_context->uniformMatrix4fv(location, 1, false, matrixAsFloats);

Return to Bug 109321

Lines 70-82 TextureMapperShaderProgram::TextureMappe Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp_sec1
- Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp -4 / +9 lines
70	LOG(Compositing, "Program log: %s\n", log.utf8().data());	70	LOG(Compositing, "Program log: %s\n", log.utf8().data());
71	}	71	}
72		72
		73	static inline GC3Dfloat asGC3Dfloat(double value)
		74	{
		75	return static_cast<GC3Dfloat>(value);
		76	}
		77
73	void TextureMapperShaderProgram::setMatrix(GC3Duint location, const TransformationMatrix& matrix)	78	void TextureMapperShaderProgram::setMatrix(GC3Duint location, const TransformationMatrix& matrix)
74	{	79	{
75	GC3Dfloat matrixAsFloats[] = {	80	GC3Dfloat matrixAsFloats[] = {
76	matrix.m11(), matrix.m12(), matrix.m13(), matrix.m14(),	81	asGC3Dfloat(matrix.m11()), asGC3Dfloat(matrix.m12()), asGC3Dfloat(matrix.m13()), asGC3Dfloat(matrix.m14()),
77	matrix.m21(), matrix.m22(), matrix.m23(), matrix.m24(),	82	asGC3Dfloat(matrix.m21()), asGC3Dfloat(matrix.m22()), asGC3Dfloat(matrix.m23()), asGC3Dfloat(matrix.m24()),
78	matrix.m31(), matrix.m32(), matrix.m33(), matrix.m34(),	83	asGC3Dfloat(matrix.m31()), asGC3Dfloat(matrix.m32()), asGC3Dfloat(matrix.m33()), asGC3Dfloat(matrix.m34()),
79	matrix.m41(), matrix.m42(), matrix.m43(), matrix.m44()	84	asGC3Dfloat(matrix.m41()), asGC3Dfloat(matrix.m42()), asGC3Dfloat(matrix.m43()), asGC3Dfloat(matrix.m44())
80	};	85	};
81		86
82	m_context->uniformMatrix4fv(location, 1, false, matrixAsFloats);	87	m_context->uniformMatrix4fv(location, 1, false, matrixAsFloats);

Lines 1-3 Source/WebCore/ChangeLog_sec1
- Source/WebCore/ChangeLog +19 lines
		1	2013-02-08 Zan Dobersek <zdobersek@igalia.com>
		2
		3	[GTK] Build errors in TextureMapperShaderProgram.cpp when compiling with Clang
		4	https://bugs.webkit.org/show_bug.cgi?id=109321
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Clang is reporting errors due to non-constant expressions that cannot be narrowed
		9	from double to float type in initializer list when constructing a matrix of GC3Dfloat
		10	numbers. To avoid this every parameter is passed through an inline function that casts
		11	the value from the double type to the GC3Dfloat one.
		12
		13	No new tests - no new functionality.
		14
		15	* platform/graphics/texmap/TextureMapperShaderProgram.cpp:
		16	(WebCore::asGC3Dfloat):
		17	(WebCore):
		18	(WebCore::TextureMapperShaderProgram::setMatrix):
		19
1	2013-02-08 Dean Jackson <dino@apple.com>	20	2013-02-08 Dean Jackson <dino@apple.com>
2		21
3	Put snapshotting label text into localizable strings	22	Put snapshotting label text into localizable strings