diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2013-09-18 11:51:20 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 08:53:35 +0200 |
| commit | 1a334f8135d4be7b73b39ac736af0e722c864e83 (patch) | |
| tree | cc0b7703b815e9fca858e8eecd7eb556e186998c /src/angle/src/compiler | |
| parent | d84ed9a92ae0ce96b843c9dd5c263c6a0925405b (diff) | |
ANGLE: Update to version 2446
Update ANGLE and reapply patches.
Patch changes:
"Dynamically resolve functions of dwmapi.dll"
Removed; ANGLE no longer uses DWM API
"Make it possible to link ANGLE statically for single-thread use"
Avoid name collision by using ANGLE-style getCurrent()
"Fix build when SSE2 is not available."
Added guard for __cpuid(), which is not available on ARM
"Make DX9/DX11 mutually exclusive"
Adjustments due to underlying code changes
"ANGLE: Avoid memory copies on buffers when data is null"
Removed; fixed upstream
"Add missing intrin.h include for __cpuid"
Removed; fixed upstream
Change-Id: I4f3d850fc555d3194ddc05e0b51c4966d33f7eaf
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/angle/src/compiler')
| -rw-r--r-- | src/angle/src/compiler/translator_common.pro | 7 | ||||
| -rw-r--r-- | src/angle/src/compiler/translator_hlsl.pro | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/angle/src/compiler/translator_common.pro b/src/angle/src/compiler/translator_common.pro index cafbb1595d..b2812158e1 100644 --- a/src/angle/src/compiler/translator_common.pro +++ b/src/angle/src/compiler/translator_common.pro @@ -4,6 +4,9 @@ TARGET = $$qtLibraryTarget(translator_common) include(../config.pri) +# Mingw 4.7 chokes on implicit move semantics, so disable C++11 here +win32-g++*: CONFIG -= c++11 + INCLUDEPATH += \ $$ANGLE_DIR/src \ $$ANGLE_DIR/include @@ -20,6 +23,7 @@ HEADERS += \ $$ANGLE_DIR/src/compiler/ConstantUnion.h \ $$ANGLE_DIR/src/compiler/debug.h \ $$ANGLE_DIR/src/compiler/DetectRecursion.h \ + $$ANGLE_DIR/src/compiler/DetectCallDepth.h \ $$ANGLE_DIR/src/compiler/Diagnostics.h \ $$ANGLE_DIR/src/compiler/DirectiveHandler.h \ $$ANGLE_DIR/src/compiler/ForLoopUnroll.h \ @@ -27,6 +31,7 @@ HEADERS += \ $$ANGLE_DIR/src/compiler/Initialize.h \ $$ANGLE_DIR/src/compiler/InitializeDll.h \ $$ANGLE_DIR/src/compiler/InitializeGlobals.h \ + $$ANGLE_DIR/src/compiler/InitializeGLPosition.h \ $$ANGLE_DIR/src/compiler/InitializeParseContext.h \ $$ANGLE_DIR/src/compiler/intermediate.h \ $$ANGLE_DIR/src/compiler/localintermediate.h \ @@ -59,6 +64,7 @@ SOURCES += \ $$ANGLE_DIR/src/compiler/BuiltInFunctionEmulator.cpp \ $$ANGLE_DIR/src/compiler/Compiler.cpp \ $$ANGLE_DIR/src/compiler/debug.cpp \ + $$ANGLE_DIR/src/compiler/DetectCallDepth.cpp \ $$ANGLE_DIR/src/compiler/DetectRecursion.cpp \ $$ANGLE_DIR/src/compiler/Diagnostics.cpp \ $$ANGLE_DIR/src/compiler/DirectiveHandler.cpp \ @@ -66,6 +72,7 @@ SOURCES += \ $$ANGLE_DIR/src/compiler/InfoSink.cpp \ $$ANGLE_DIR/src/compiler/Initialize.cpp \ $$ANGLE_DIR/src/compiler/InitializeDll.cpp \ + $$ANGLE_DIR/src/compiler/InitializeGLPosition.cpp \ $$ANGLE_DIR/src/compiler/InitializeParseContext.cpp \ $$ANGLE_DIR/src/compiler/Intermediate.cpp \ $$ANGLE_DIR/src/compiler/intermOut.cpp \ diff --git a/src/angle/src/compiler/translator_hlsl.pro b/src/angle/src/compiler/translator_hlsl.pro index 6b17f14d2e..1c31cad297 100644 --- a/src/angle/src/compiler/translator_hlsl.pro +++ b/src/angle/src/compiler/translator_hlsl.pro @@ -4,6 +4,9 @@ TARGET = $$qtLibraryTarget(translator_hlsl) include(../config.pri) +# Mingw 4.7 chokes on implicit move semantics, so disable C++11 here +win32-g++*: CONFIG -= c++11 + INCLUDEPATH += $$ANGLE_DIR/src \ $$ANGLE_DIR/include |