From e0c0e83fd5534b24f18d5e02a453182df54933e0 Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Mon, 15 Oct 2012 14:16:51 +0200 Subject: Add ANGLE as a 3rdparty library to Qt. ANGLE is a component that implements the OpenGL ES 2.0 API on top of DirectX 9. See the following for more info: http://code.google.com/p/angleproject/ ANGLE is now the default configuration on Windows. If you want to use desktop OpenGL, you should build Qt with the following configure options: -opengl desktop To configure Qt to use another OpenGL ES 2 implementation, you should use: -opengl es2 -no-angle Task-number: QTBUG-24207 Change-Id: Iefcbeaa37ed920f431729749ab8333b248fe5134 Reviewed-by: Friedemann Kleint --- .../patches/0003-Fix-Float16ToFloat32.py.patch | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 src/angle/patches/0003-Fix-Float16ToFloat32.py.patch (limited to 'src/angle/patches') diff --git a/src/angle/patches/0003-Fix-Float16ToFloat32.py.patch b/src/angle/patches/0003-Fix-Float16ToFloat32.py.patch new file mode 100644 index 0000000000..c37ab43fb9 --- /dev/null +++ b/src/angle/patches/0003-Fix-Float16ToFloat32.py.patch @@ -0,0 +1,54 @@ +From e4f894847ebefe54f9a9f9911c38dc3efe77c260 Mon Sep 17 00:00:00 2001 +From: Jason Barron +Date: Tue, 16 Oct 2012 10:34:32 +0200 +Subject: [PATCH 3/3] Fix Float16ToFloat32.py. + +To ensure generation of compilable code, the script should +be using the alternate form of the hex string formatter to +be sure it gets prefixed by '0x'. + +Also remove an extra '=' character. + +This issue has been reported upstream to the ANGLE team: + + http://code.google.com/p/angleproject/issues/detail?id=376 + +Change-Id: I8ccf017afcfbd2c2f52ed291b89f29ba597c9c41 +--- + src/3rdparty/angle/src/libGLESv2/Float16ToFloat32.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/3rdparty/angle/src/libGLESv2/Float16ToFloat32.py b/src/3rdparty/angle/src/libGLESv2/Float16ToFloat32.py +index ae646ff..fb2964e 100644 +--- a/src/3rdparty/angle/src/libGLESv2/Float16ToFloat32.py ++++ b/src/3rdparty/angle/src/libGLESv2/Float16ToFloat32.py +@@ -56,22 +56,22 @@ namespace gl + + print "const static unsigned g_mantissa[2048] = {" + for i in range(0, 2048): +- print " %08x," % convertMantissa(i) ++ print " %#10x," % convertMantissa(i) + print "};\n" + + print "const static unsigned g_exponent[64] = {" + for i in range(0, 64): +- print " %08x," % convertExponent(i) ++ print " %#10x," % convertExponent(i) + print "};\n" + + print "const static unsigned g_offset[64] = {" + for i in range(0, 64): +- print " %08x," % convertOffset(i) ++ print " %#10x," % convertOffset(i) + print "};\n" + + print """float float16ToFloat32(unsigned short h) + { +- unsigned i32 = =g_mantissa[g_offset[h >> 10] + (h & 0x3ff)] + g_exponent[h >> 10]; ++ unsigned i32 = g_mantissa[g_offset[h >> 10] + (h & 0x3ff)] + g_exponent[h >> 10]; + return *(float*) &i32; + } + } +-- +1.7.11.msysgit.1 + -- cgit v1.2.3