From 311157c3c6849e8efccd88f7594bb34c570a6780 Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Thu, 25 Sep 2014 13:22:55 +0300 Subject: ANGLE: Upgrade to 2.1~abce76206141 Upgrade to address issues discovered since the last upgrade. Patch notes: 0000-General-fixes-for-ANGLE-2.1.patch added removal of the unused third-party tracing functions 0003-Fix-compilation-with-MinGW-gcc-64-bit.patch removed as it is no longer needed 0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch removed as it is no longer needed 0016-ANGLE-Fix-compilation-with-MinGW-D3D11.patch now supports MinGW 64-bit [ChangeLog][Third-party libraries] ANGLE updated to 2.1~f8602ad91e4f Task-number: QTBUG-40649 Task-number: QTBUG-40658 Task-number: QTBUG-41031 Task-number: QTBUG-41081 Task-number: QTBUG-41308 Task-number: QTBUG-41563 Change-Id: I9f776c8d5cb94ddb12d608a8d5630bfc54437bea Reviewed-by: Friedemann Kleint Reviewed-by: Oliver Wolff Reviewed-by: Kai Koehne --- ...ompilation-error-on-MinGW-caused-by-trace.patch | 38 ---------------------- 1 file changed, 38 deletions(-) delete mode 100644 src/angle/patches/0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch (limited to 'src/angle/patches/0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch') diff --git a/src/angle/patches/0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch b/src/angle/patches/0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch deleted file mode 100644 index 72221117c4..0000000000 --- a/src/angle/patches/0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a814e99f287ff19317ab1651428a5fa330aefd08 Mon Sep 17 00:00:00 2001 -From: Andrew Knight -Date: Wed, 2 Jul 2014 08:33:00 +0300 -Subject: [PATCH 11/12] ANGLE: Fix compilation error on MinGW caused by - trace_event.h - -The event trace header in ANGLE's third_party directory has an unused -template which causes a compilation error on MinGW. Disable this part -of the code. - -Change-Id: I167eac56507fafba34e3eb5ce6071d8f136a4e41 ---- - src/3rdparty/angle/src/third_party/trace_event/trace_event.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/3rdparty/angle/src/third_party/trace_event/trace_event.h b/src/3rdparty/angle/src/third_party/trace_event/trace_event.h -index 637cf9a..96ac910 100644 ---- a/src/3rdparty/angle/src/third_party/trace_event/trace_event.h -+++ b/src/3rdparty/angle/src/third_party/trace_event/trace_event.h -@@ -791,6 +791,7 @@ private: - // TraceEventSamplingStateScope records the current sampling state - // and sets a new sampling state. When the scope exists, it restores - // the sampling state having recorded. -+#if 0 // This is not used by ANGLE and causes a compilation error on MinGW - template - class SamplingStateScope { - public: -@@ -818,6 +819,7 @@ public: - private: - const char* m_previousState; - }; -+#endif - - } // namespace TraceEvent - --- -1.9.0.msysgit.0 - -- cgit v1.2.3