Upgrade ANGLE to 1.3.5bb7ec572d0a

This brings Qt's copy of ANGLE up to ANGLE master, which contains a number
of bugfixes as well as restructuring for the upcoming ES 3.0 support. This
version brings considerable stability improvements to the D3D11 renderer.

The static translator project files have been merged to align with the
ANGLE source tree.

Two new patches have been applied to fix errors in upstream ANGLE:
- 0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch
  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.
- 0012-ANGLE-fix-semantic-index-lookup.patch
  The sorted semantic index table was returning a direct mapping to the
  new indices, instead of the old indices. This caused a mismatch in the
  GL type lookup for the translated attribute.

All other patches have been rebased, removed if no longer needed,
and renamed to clear up the application order:
- 0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch
  No changes.
- 0001-Fix-compilation-with-MinGW-mingw-tdm64-gcc-4.8.1.patch
  No changes. Renamed to 0002.
- 0001-Fix-compilation-with-MinGW-gcc-64-bit.patch
  No changes. Renamed to 0003.
- 0001-Make-it-possible-to-link-ANGLE-statically-for-single.patch
  Modified patch to adapt to new DLL loading structure. Renamed to 0004.
- 0005-Fix-build-when-SSE2-is-not-available.patch
  No changes.
- 0011-Fix-compilation-of-libGLESv2-with-older-MinGW-w64-he.patch
  No changes. Renamed to 0006.
- 0006-Make-DX9-DX11-mutually-exclusive.patch
  Made the patch less invasive by allowing D3D9 code to run unless
  explicitly disabled (e.g. on WinRT, where it doesn't compile). This
  makes the patch smaller and allows Desktop Windows to compile both
  D3D9 and D3D11 codepaths. Renamed to 0007.
- 0015-ANGLE-Dynamically-load-D3D-compiler-from-a-list-of-k.patch
  No changes. Renamed to 0008.
- 0012-ANGLE-Support-WinRT.patch
  Made D3D11_level9 initialization only possible if D3D9 is disabled.
  This makes sure Desktop PCs use the old D3D9 codepath instead of
  the less-tested D3D11_level9 codepath. Renamed to 0009.
- 0013-Enable-D3D11-for-feature-level-9-cards.patch
  Conveniently smaller patch due to buffer implementation improvements
  upstream. Renamed to 0010.
- 0014-ANGLE-D3D11-Alwayls-execute-QueryInterface.patch
  This was a fix for patch 0009, so was integrated there. Removed.
- 0016-ANGLE-D3D11-Fix-build-on-desktop-Windows.patch
  This was a fix for patch 0009, so it was integrated there. Removed.
- 0001-ANGLE-Fix-compilation-with-MSVC2013.patch
  Fixed upstream. Removed.
- 0007-ANGLE-Fix-typedefs-for-Win64.patch
  Fixed upstream. Removed.
- 0004-Fix-black-screen-after-minimizing-OpenGL-window-with.patch
  The issue has been fixed in Qt itself. Removed.
- 0008-DX11-Prevent-assert-when-view-is-minimized-or-.patch
  The cause of the problem was the same as patch 0004, but for the
  D3D11 codepath. Removed.

Change-Id: Id69484ab3a3e013050741c462fb1b06dfb0fd112
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>

8 files changed, 254 insertions, 252 deletions

diff --git a/src/angle/src/compiler/compiler.pro b/src/angle/src/compiler/compiler.pro
index 26b03bfc86..7f3f3e301e 100644
--- a/src/angle/src/compiler/compiler.pro
+++ b/src/angle/src/compiler/compiler.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS =  preprocessor translator_common.pro translator_hlsl.pro
+SUBDIRS =  preprocessor translator.pro
diff --git a/src/angle/src/compiler/preprocessor/preprocessor.pro b/src/angle/src/compiler/preprocessor/preprocessor.pro
index 432c8dcf32..74cd97c5a4 100644
--- a/src/angle/src/compiler/preprocessor/preprocessor.pro
+++ b/src/angle/src/compiler/preprocessor/preprocessor.pro
@@ -21,6 +21,7 @@ HEADERS += \
     $$ANGLE_DIR/src/compiler/preprocessor/DirectiveParser.h \
     $$ANGLE_DIR/src/compiler/preprocessor/ExpressionParser.h \
     $$ANGLE_DIR/src/compiler/preprocessor/Input.h \
+    $$ANGLE_DIR/src/compiler/preprocessor/length_limits.h \
     $$ANGLE_DIR/src/compiler/preprocessor/Lexer.h \
     $$ANGLE_DIR/src/compiler/preprocessor/Macro.h \
     $$ANGLE_DIR/src/compiler/preprocessor/MacroExpander.h \
diff --git a/src/angle/src/compiler/translator.pro b/src/angle/src/compiler/translator.pro
new file mode 100644
index 0000000000..0051486f82
--- /dev/null
+++ b/src/angle/src/compiler/translator.pro
@@ -0,0 +1,163 @@
+TEMPLATE = lib
+CONFIG += static
+TARGET = $$qtLibraryTarget(translator)
+
+include(../config.pri)
+
+# Mingw 4.7 chokes on implicit move semantics, so disable C++11 here
+mingw: CONFIG -= c++11
+
+INCLUDEPATH += \
+    $$ANGLE_DIR/src \
+    $$ANGLE_DIR/include
+
+DEFINES += _SECURE_SCL=0 _LIB COMPILER_IMPLEMENTATION
+
+FLEX_SOURCES = $$ANGLE_DIR/src/compiler/translator/glslang.l
+BISON_SOURCES = $$ANGLE_DIR/src/compiler/translator/glslang.y
+
+HEADERS += \
+    $$ANGLE_DIR/include/GLSLANG/ResourceLimits.h \
+    $$ANGLE_DIR/include/GLSLANG/ShaderLang.h \
+    $$ANGLE_DIR/src/compiler/translator/BaseTypes.h \
+    $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulator.h \
+    $$ANGLE_DIR/src/compiler/translator/Common.h \
+    $$ANGLE_DIR/src/compiler/translator/compilerdebug.h \
+    $$ANGLE_DIR/src/compiler/translator/ConstantUnion.h \
+    $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraph.h \
+    $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraphBuilder.h \
+    $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraphOutput.h \
+    $$ANGLE_DIR/src/compiler/translator/DetectCallDepth.h \
+    $$ANGLE_DIR/src/compiler/translator/DetectDiscontinuity.h \
+    $$ANGLE_DIR/src/compiler/translator/Diagnostics.h \
+    $$ANGLE_DIR/src/compiler/translator/DirectiveHandler.h \
+    $$ANGLE_DIR/src/compiler/translator/ExtensionBehavior.h \
+    $$ANGLE_DIR/src/compiler/translator/ForLoopUnroll.h \
+    $$ANGLE_DIR/src/compiler/translator/HashNames.h \
+    $$ANGLE_DIR/src/compiler/translator/InfoSink.h \
+    $$ANGLE_DIR/src/compiler/translator/Initialize.h \
+    $$ANGLE_DIR/src/compiler/translator/InitializeDll.h \
+    $$ANGLE_DIR/src/compiler/translator/InitializeParseContext.h \
+    $$ANGLE_DIR/src/compiler/translator/InitializeVariables.h \
+    $$ANGLE_DIR/src/compiler/translator/intermediate.h \
+    $$ANGLE_DIR/src/compiler/translator/localintermediate.h \
+    $$ANGLE_DIR/src/compiler/translator/MapLongVariableNames.h \
+    $$ANGLE_DIR/src/compiler/translator/MMap.h \
+    $$ANGLE_DIR/src/compiler/translator/NodeSearch.h \
+    $$ANGLE_DIR/src/compiler/translator/osinclude.h \
+    $$ANGLE_DIR/src/compiler/translator/OutputESSL.h \
+    $$ANGLE_DIR/src/compiler/translator/OutputGLSL.h \
+    $$ANGLE_DIR/src/compiler/translator/OutputGLSLBase.h \
+    $$ANGLE_DIR/src/compiler/translator/OutputHLSL.h \
+    $$ANGLE_DIR/src/compiler/translator/ParseContext.h \
+    $$ANGLE_DIR/src/compiler/translator/PoolAlloc.h \
+    $$ANGLE_DIR/src/compiler/translator/Pragma.h \
+    $$ANGLE_DIR/src/compiler/translator/QualifierAlive.h \
+    $$ANGLE_DIR/src/compiler/translator/RemoveTree.h \
+    $$ANGLE_DIR/src/compiler/translator/RenameFunction.h \
+    $$ANGLE_DIR/src/compiler/translator/RewriteElseBlocks.h \
+    $$ANGLE_DIR/src/compiler/translator/SearchSymbol.h \
+    $$ANGLE_DIR/src/compiler/translator/ShHandle.h \
+    $$ANGLE_DIR/src/compiler/translator/SymbolTable.h \
+    $$ANGLE_DIR/src/compiler/translator/timing/RestrictFragmentShaderTiming.h \
+    $$ANGLE_DIR/src/compiler/translator/timing/RestrictVertexShaderTiming.h \
+    $$ANGLE_DIR/src/compiler/translator/TranslatorESSL.h \
+    $$ANGLE_DIR/src/compiler/translator/TranslatorGLSL.h \
+    $$ANGLE_DIR/src/compiler/translator/TranslatorHLSL.h \
+    $$ANGLE_DIR/src/compiler/translator/Types.h \
+    $$ANGLE_DIR/src/compiler/translator/UnfoldShortCircuit.h \
+    $$ANGLE_DIR/src/compiler/translator/UnfoldShortCircuitAST.h \
+    $$ANGLE_DIR/src/compiler/translator/Uniform.h \
+    $$ANGLE_DIR/src/compiler/translator/util.h \
+    $$ANGLE_DIR/src/compiler/translator/ValidateLimitations.h \
+    $$ANGLE_DIR/src/compiler/translator/VariableInfo.h \
+    $$ANGLE_DIR/src/compiler/translator/VariablePacker.h \
+    $$ANGLE_DIR/src/compiler/translator/VersionGLSL.h \
+    $$ANGLE_DIR/src/third_party/compiler/ArrayBoundsClamper.h
+
+
+SOURCES += \
+    $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulator.cpp \
+    $$ANGLE_DIR/src/compiler/translator/CodeGen.cpp \
+    $$ANGLE_DIR/src/compiler/translator/Compiler.cpp \
+    $$ANGLE_DIR/src/compiler/translator/compilerdebug.cpp \
+    $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraph.cpp \
+    $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraphBuilder.cpp \
+    $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraphOutput.cpp \
+    $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraphTraverse.cpp \
+    $$ANGLE_DIR/src/compiler/translator/DetectCallDepth.cpp \
+    $$ANGLE_DIR/src/compiler/translator/DetectDiscontinuity.cpp \
+    $$ANGLE_DIR/src/compiler/translator/Diagnostics.cpp \
+    $$ANGLE_DIR/src/compiler/translator/DirectiveHandler.cpp \
+    $$ANGLE_DIR/src/compiler/translator/ForLoopUnroll.cpp \
+    $$ANGLE_DIR/src/compiler/translator/InfoSink.cpp \
+    $$ANGLE_DIR/src/compiler/translator/Initialize.cpp \
+    $$ANGLE_DIR/src/compiler/translator/InitializeDll.cpp \
+    $$ANGLE_DIR/src/compiler/translator/InitializeParseContext.cpp \
+    $$ANGLE_DIR/src/compiler/translator/InitializeVariables.cpp \
+    $$ANGLE_DIR/src/compiler/translator/Intermediate.cpp \
+    $$ANGLE_DIR/src/compiler/translator/intermOut.cpp \
+    $$ANGLE_DIR/src/compiler/translator/IntermTraverse.cpp \
+    $$ANGLE_DIR/src/compiler/translator/MapLongVariableNames.cpp \
+    $$ANGLE_DIR/src/compiler/translator/OutputESSL.cpp \
+    $$ANGLE_DIR/src/compiler/translator/OutputGLSL.cpp \
+    $$ANGLE_DIR/src/compiler/translator/OutputGLSLBase.cpp \
+    $$ANGLE_DIR/src/compiler/translator/OutputHLSL.cpp \
+    $$ANGLE_DIR/src/compiler/translator/parseConst.cpp \
+    $$ANGLE_DIR/src/compiler/translator/ParseContext.cpp \
+    $$ANGLE_DIR/src/compiler/translator/PoolAlloc.cpp \
+    $$ANGLE_DIR/src/compiler/translator/QualifierAlive.cpp \
+    $$ANGLE_DIR/src/compiler/translator/RemoveTree.cpp \
+    $$ANGLE_DIR/src/compiler/translator/RewriteElseBlocks.cpp \
+    $$ANGLE_DIR/src/compiler/translator/SearchSymbol.cpp \
+    $$ANGLE_DIR/src/compiler/translator/ShaderLang.cpp \
+    $$ANGLE_DIR/src/compiler/translator/SymbolTable.cpp \
+    $$ANGLE_DIR/src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp \
+    $$ANGLE_DIR/src/compiler/translator/timing/RestrictVertexShaderTiming.cpp \
+    $$ANGLE_DIR/src/compiler/translator/TranslatorESSL.cpp \
+    $$ANGLE_DIR/src/compiler/translator/TranslatorGLSL.cpp \
+    $$ANGLE_DIR/src/compiler/translator/TranslatorHLSL.cpp \
+    $$ANGLE_DIR/src/compiler/translator/UnfoldShortCircuit.cpp \
+    $$ANGLE_DIR/src/compiler/translator/UnfoldShortCircuitAST.cpp \
+    $$ANGLE_DIR/src/compiler/translator/Uniform.cpp \
+    $$ANGLE_DIR/src/compiler/translator/util.cpp \
+    $$ANGLE_DIR/src/compiler/translator/ValidateLimitations.cpp \
+    $$ANGLE_DIR/src/compiler/translator/VariableInfo.cpp \
+    $$ANGLE_DIR/src/compiler/translator/VariablePacker.cpp \
+    $$ANGLE_DIR/src/compiler/translator/VersionGLSL.cpp \
+    $$ANGLE_DIR/src/third_party/compiler/ArrayBoundsClamper.cpp
+
+
+winrt {
+    SOURCES += $$ANGLE_DIR/src/compiler/translator/ossource_winrt.cpp
+} else {
+    SOURCES += $$ANGLE_DIR/src/compiler/translator/ossource_win.cpp
+}
+
+# NOTE: 'win_flex' and 'bison' can be found in qt5/gnuwin32/bin
+flex.commands = $$addGnuPath(win_flex) --noline --nounistd --outfile=${QMAKE_FILE_BASE}_lex.cpp ${QMAKE_FILE_NAME}
+flex.output = ${QMAKE_FILE_BASE}_lex.cpp
+flex.input = FLEX_SOURCES
+flex.dependency_type = TYPE_C
+flex.variable_out = GENERATED_SOURCES
+QMAKE_EXTRA_COMPILERS += flex
+
+bison.commands = $$addGnuPath(bison) --no-lines --skeleton=yacc.c --defines=${QMAKE_FILE_BASE}_tab.h \
+                --output=${QMAKE_FILE_BASE}_tab.cpp ${QMAKE_FILE_NAME}
+bison.output = ${QMAKE_FILE_BASE}_tab.h
+bison.input = BISON_SOURCES
+bison.dependency_type = TYPE_C
+bison.variable_out = GENERATED_SOURCES
+QMAKE_EXTRA_COMPILERS += bison
+
+# This is a dummy compiler to work around the fact that an extra compiler can only
+# have one output file even if the command generates two.
+MAKEFILE_NOOP_COMMAND = @echo -n
+msvc: MAKEFILE_NOOP_COMMAND = @echo >NUL
+bison_impl.output = ${QMAKE_FILE_BASE}_tab.cpp
+bison_impl.input = BISON_SOURCES
+bison_impl.commands = $$MAKEFILE_NOOP_COMMAND
+bison_impl.depends = ${QMAKE_FILE_BASE}_tab.h
+bison_impl.output = ${QMAKE_FILE_BASE}_tab.cpp
+bison_impl.variable_out = GENERATED_SOURCES
+QMAKE_EXTRA_COMPILERS += bison_impl
diff --git a/src/angle/src/compiler/translator_common.pro b/src/angle/src/compiler/translator_common.pro
deleted file mode 100644
index c8f86d6b10..0000000000
--- a/src/angle/src/compiler/translator_common.pro
+++ /dev/null
@@ -1,133 +0,0 @@
-TEMPLATE = lib
-CONFIG += static
-TARGET = $$qtLibraryTarget(translator_common)
-
-include(../config.pri)
-
-# Mingw 4.7 chokes on implicit move semantics, so disable C++11 here
-mingw: CONFIG -= c++11
-
-INCLUDEPATH += \
-    $$ANGLE_DIR/src \
-    $$ANGLE_DIR/include
-
-DEFINES += _SECURE_SCL=0 _LIB COMPILER_IMPLEMENTATION
-
-FLEX_SOURCES = $$ANGLE_DIR/src/compiler/glslang.l
-BISON_SOURCES = $$ANGLE_DIR/src/compiler/glslang.y
-
-HEADERS += \
-    $$ANGLE_DIR/src/compiler/BaseTypes.h \
-    $$ANGLE_DIR/src/compiler/BuiltInFunctionEmulator.h \
-    $$ANGLE_DIR/src/compiler/Common.h \
-    $$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 \
-    $$ANGLE_DIR/src/compiler/InfoSink.h \
-    $$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 \
-    $$ANGLE_DIR/src/compiler/MapLongVariableNames.h \
-    $$ANGLE_DIR/src/compiler/MMap.h \
-    $$ANGLE_DIR/src/compiler/osinclude.h \
-    $$ANGLE_DIR/src/compiler/ParseHelper.h \
-    $$ANGLE_DIR/src/compiler/PoolAlloc.h \
-    $$ANGLE_DIR/src/compiler/QualifierAlive.h \
-    $$ANGLE_DIR/src/compiler/RemoveTree.h \
-    $$ANGLE_DIR/src/compiler/RenameFunction.h \
-    $$ANGLE_DIR/include/GLSLANG/ResourceLimits.h \
-    $$ANGLE_DIR/include/GLSLANG/ShaderLang.h \
-    $$ANGLE_DIR/src/compiler/ShHandle.h \
-    $$ANGLE_DIR/src/compiler/SymbolTable.h \
-    $$ANGLE_DIR/src/compiler/Types.h \
-    $$ANGLE_DIR/src/compiler/UnfoldShortCircuit.h \
-    $$ANGLE_DIR/src/compiler/util.h \
-    $$ANGLE_DIR/src/compiler/ValidateLimitations.h \
-    $$ANGLE_DIR/src/compiler/VariableInfo.h \
-    $$ANGLE_DIR/src/compiler/VariablePacker.h \
-    $$ANGLE_DIR/src/compiler/timing/RestrictFragmentShaderTiming.h \
-    $$ANGLE_DIR/src/compiler/timing/RestrictVertexShaderTiming.h \
-    $$ANGLE_DIR/src/compiler/depgraph/DependencyGraph.h \
-    $$ANGLE_DIR/src/compiler/depgraph/DependencyGraphBuilder.h \
-    $$ANGLE_DIR/src/compiler/depgraph/DependencyGraphOutput.h \
-    $$ANGLE_DIR/src/third_party/compiler/ArrayBoundsClamper.h
-
-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 \
-    $$ANGLE_DIR/src/compiler/ForLoopUnroll.cpp \
-    $$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 \
-    $$ANGLE_DIR/src/compiler/IntermTraverse.cpp \
-    $$ANGLE_DIR/src/compiler/MapLongVariableNames.cpp \
-    $$ANGLE_DIR/src/compiler/parseConst.cpp \
-    $$ANGLE_DIR/src/compiler/ParseHelper.cpp \
-    $$ANGLE_DIR/src/compiler/PoolAlloc.cpp \
-    $$ANGLE_DIR/src/compiler/QualifierAlive.cpp \
-    $$ANGLE_DIR/src/compiler/RemoveTree.cpp \
-    $$ANGLE_DIR/src/compiler/ShaderLang.cpp \
-    $$ANGLE_DIR/src/compiler/SymbolTable.cpp \
-    $$ANGLE_DIR/src/compiler/util.cpp \
-    $$ANGLE_DIR/src/compiler/ValidateLimitations.cpp \
-    $$ANGLE_DIR/src/compiler/VariableInfo.cpp \
-    $$ANGLE_DIR/src/compiler/VariablePacker.cpp \
-    $$ANGLE_DIR/src/compiler/depgraph/DependencyGraph.cpp \
-    $$ANGLE_DIR/src/compiler/depgraph/DependencyGraphBuilder.cpp \
-    $$ANGLE_DIR/src/compiler/depgraph/DependencyGraphOutput.cpp \
-    $$ANGLE_DIR/src/compiler/depgraph/DependencyGraphTraverse.cpp \
-    $$ANGLE_DIR/src/compiler/timing/RestrictFragmentShaderTiming.cpp \
-    $$ANGLE_DIR/src/compiler/timing/RestrictVertexShaderTiming.cpp \
-    $$ANGLE_DIR/src/third_party/compiler/ArrayBoundsClamper.cpp
-
-winrt {
-    SOURCES += $$ANGLE_DIR/src/compiler/ossource_winrt.cpp
-} else {
-    SOURCES += $$ANGLE_DIR/src/compiler/ossource_win.cpp
-}
-
-# NOTE: 'win_flex' and 'bison' can be found in qt5/gnuwin32/bin
-flex.commands = $$addGnuPath(win_flex) --noline --nounistd --outfile=${QMAKE_FILE_BASE}_lex.cpp ${QMAKE_FILE_NAME}
-flex.output = ${QMAKE_FILE_BASE}_lex.cpp
-flex.input = FLEX_SOURCES
-flex.dependency_type = TYPE_C
-flex.variable_out = GENERATED_SOURCES
-QMAKE_EXTRA_COMPILERS += flex
-
-bison.commands = $$addGnuPath(bison) --no-lines --skeleton=yacc.c --defines=${QMAKE_FILE_BASE}_tab.h \
-                --output=${QMAKE_FILE_BASE}_tab.cpp ${QMAKE_FILE_NAME}
-bison.output = ${QMAKE_FILE_BASE}_tab.h
-bison.input = BISON_SOURCES
-bison.dependency_type = TYPE_C
-bison.variable_out = GENERATED_SOURCES
-QMAKE_EXTRA_COMPILERS += bison
-
-# This is a dummy compiler to work around the fact that an extra compiler can only
-# have one output file even if the command generates two.
-MAKEFILE_NOOP_COMMAND = @echo -n
-msvc: MAKEFILE_NOOP_COMMAND = @echo >NUL
-bison_impl.output = ${QMAKE_FILE_BASE}_tab.cpp
-bison_impl.input = BISON_SOURCES
-bison_impl.commands = $$MAKEFILE_NOOP_COMMAND
-bison_impl.depends = ${QMAKE_FILE_BASE}_tab.h
-bison_impl.output = ${QMAKE_FILE_BASE}_tab.cpp
-bison_impl.variable_out = GENERATED_SOURCES
-QMAKE_EXTRA_COMPILERS += bison_impl
-
diff --git a/src/angle/src/compiler/translator_hlsl.pro b/src/angle/src/compiler/translator_hlsl.pro
deleted file mode 100644
index f19d33a530..0000000000
--- a/src/angle/src/compiler/translator_hlsl.pro
+++ /dev/null
@@ -1,30 +0,0 @@
-TEMPLATE = lib
-CONFIG += static
-TARGET = $$qtLibraryTarget(translator_hlsl)
-
-include(../config.pri)
-
-# Mingw 4.7 chokes on implicit move semantics, so disable C++11 here
-mingw: CONFIG -= c++11
-
-INCLUDEPATH +=  $$ANGLE_DIR/src \
-                $$ANGLE_DIR/include
-
-DEFINES += COMPILER_IMPLEMENTATION
-
-HEADERS += \
-    $$ANGLE_DIR/src/compiler/DetectDiscontinuity.h \
-    $$ANGLE_DIR/src/compiler/OutputHLSL.h \
-    $$ANGLE_DIR/src/compiler/SearchSymbol.h \
-    $$ANGLE_DIR/src/compiler/TranslatorHLSL.h \
-    $$ANGLE_DIR/src/compiler/UnfoldShortCircuit.h \
-    $$ANGLE_DIR/src/compiler/Uniform.h
-
-SOURCES += \
-    $$ANGLE_DIR/src/compiler/CodeGenHLSL.cpp \
-    $$ANGLE_DIR/src/compiler/DetectDiscontinuity.cpp \
-    $$ANGLE_DIR/src/compiler/OutputHLSL.cpp \
-    $$ANGLE_DIR/src/compiler/SearchSymbol.cpp \
-    $$ANGLE_DIR/src/compiler/TranslatorHLSL.cpp \
-    $$ANGLE_DIR/src/compiler/UnfoldShortCircuit.cpp \
-    $$ANGLE_DIR/src/compiler/Uniform.cpp
diff --git a/src/angle/src/config.pri b/src/angle/src/config.pri
index ed2558117e..c6dbb90ec7 100644
--- a/src/angle/src/config.pri
+++ b/src/angle/src/config.pri
@@ -38,14 +38,12 @@ DEFINES +=  _WINDOWS \
             WIN32_LEAN_AND_MEAN=1
 
 # Defines specifying the API version (0x0600 = Vista, 0x0602 = Win8))
-winrt: DEFINES += _WIN32_WINNT=0x0602 WINVER=0x0602
-else: DEFINES += _WIN32_WINNT=0x0600 WINVER=0x0600
-
-# ANGLE specific defines
-DEFINES +=  ANGLE_DISABLE_TRACE \
-            ANGLE_DISABLE_PERF \
-            ANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL0 \
-            ANGLE_USE_NEW_PREPROCESSOR=1
+winrt {
+    DEFINES += _WIN32_WINNT=0x0602 WINVER=0x0602
+} else {
+    DEFINES += _WIN32_WINNT=0x0600 WINVER=0x0600
+    DEFINES += ANGLE_ENABLE_D3D9
+}
 
 angle_d3d11 {
     DEFINES += ANGLE_ENABLE_D3D11
diff --git a/src/angle/src/libEGL/libEGL.pro b/src/angle/src/libEGL/libEGL.pro
index f51bc8ee83..4f10583fc0 100644
--- a/src/angle/src/libEGL/libEGL.pro
+++ b/src/angle/src/libEGL/libEGL.pro
@@ -3,11 +3,11 @@ TARGET = $$qtLibraryTarget(libEGL)
 
 include(../common/common.pri)
 
-angle_d3d11 {
+angle_d3d11: \
     LIBS_PRIVATE += -ld3d11
-} else {
+!winrt: \
     LIBS_PRIVATE += -ld3d9
-}
+
 LIBS_PRIVATE += -ldxguid -L$$QT_BUILD_TREE/lib -l$$qtLibraryTarget(libGLESv2)
 
 HEADERS += \
diff --git a/src/angle/src/libGLESv2/libGLESv2.pro b/src/angle/src/libGLESv2/libGLESv2.pro
index 75853e219e..6176016f13 100644
--- a/src/angle/src/libGLESv2/libGLESv2.pro
+++ b/src/angle/src/libGLESv2/libGLESv2.pro
@@ -7,13 +7,13 @@ include(../common/common.pri)
 INCLUDEPATH += $$OUT_PWD/.. $$ANGLE_DIR/src/libGLESv2
 
 # Remember to adapt tools/configure/configureapp.cpp if the Direct X version changes.
-angle_d3d11 {
+angle_d3d11: \
     LIBS_PRIVATE += -ldxgi -ld3d11
-} else {
+!winrt: \
     LIBS_PRIVATE += -ld3d9
-}
+
 LIBS_PRIVATE += -ldxguid
-STATICLIBS = translator_common translator_hlsl preprocessor
+STATICLIBS = translator preprocessor
 
 for(libname, STATICLIBS) {
     # Appends 'd' to the library for debug builds and builds up the fully
@@ -93,67 +93,69 @@ SSE2_SOURCES += $$ANGLE_DIR/src/libGLESv2/renderer/ImageSSE2.cpp
 
 angle_d3d11 {
     HEADERS += \
-        $$ANGLE_DIR/src/libGLESv2/renderer/BufferStorage11.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Fence11.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Image11.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/IndexBuffer11.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/InputLayoutCache.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Query11.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Renderer11.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/renderer11_utils.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/RenderTarget11.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/RenderStateCache.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/ShaderExecutable11.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/SwapChain11.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/TextureStorage11.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/VertexBuffer11.h
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/BufferStorage11.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/Fence11.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/Image11.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/IndexBuffer11.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/InputLayoutCache.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/Query11.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/Renderer11.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/renderer11_utils.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/RenderTarget11.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/RenderStateCache.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/ShaderExecutable11.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/SwapChain11.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/TextureStorage11.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/VertexBuffer11.h
 
     SOURCES += \
-        $$ANGLE_DIR/src/libGLESv2/renderer/BufferStorage11.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Fence11.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Image11.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/IndexBuffer11.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/InputLayoutCache.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Query11.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Renderer11.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/renderer11_utils.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/RenderTarget11.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/RenderStateCache.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/ShaderExecutable11.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/SwapChain11.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/TextureStorage11.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/VertexBuffer11.cpp
-} else {
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/BufferStorage11.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/Fence11.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/Image11.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/IndexBuffer11.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/InputLayoutCache.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/Query11.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/Renderer11.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/renderer11_utils.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/RenderTarget11.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/RenderStateCache.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/ShaderExecutable11.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/SwapChain11.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/TextureStorage11.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/VertexBuffer11.cpp
+}
+
+!winrt {
     HEADERS += \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Blit.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/BufferStorage9.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Fence9.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Image9.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/IndexBuffer9.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Query9.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Renderer9.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/renderer9_utils.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/RenderTarget9.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/ShaderExecutable9.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/SwapChain9.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/TextureStorage9.h \
-        $$ANGLE_DIR/src/libGLESv2/renderer/VertexBuffer9.h
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/Blit.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/BufferStorage9.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/Fence9.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/Image9.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/IndexBuffer9.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/Query9.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/Renderer9.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/renderer9_utils.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/RenderTarget9.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/ShaderExecutable9.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/SwapChain9.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/TextureStorage9.h \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/VertexBuffer9.h
 
     SOURCES += \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Blit.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/BufferStorage9.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Fence9.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Image9.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/IndexBuffer9.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Query9.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/Renderer9.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/renderer9_utils.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/RenderTarget9.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/ShaderExecutable9.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/SwapChain9.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/TextureStorage9.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/VertexBuffer9.cpp \
-        $$ANGLE_DIR/src/libGLESv2/renderer/VertexDeclarationCache.cpp
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/Blit.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/BufferStorage9.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/Fence9.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/Image9.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/IndexBuffer9.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/Query9.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/Renderer9.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/renderer9_utils.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/RenderTarget9.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/ShaderExecutable9.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/SwapChain9.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/TextureStorage9.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/VertexBuffer9.cpp \
+        $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/VertexDeclarationCache.cpp
 }
 
 !static {
@@ -167,10 +169,10 @@ float_converter.commands = python $$ANGLE_DIR/src/libGLESv2/Float16ToFloat32.py
 QMAKE_EXTRA_TARGETS += float_converter
 
 # Generate the shader header files.
-PS_BLIT_INPUT = $$ANGLE_DIR/src/libGLESv2/renderer/shaders/Blit.ps
-VS_BLIT_INPUT = $$ANGLE_DIR/src/libGLESv2/renderer/shaders/Blit.vs
-PASSTHROUGH_INPUT = $$ANGLE_DIR/src/libGLESv2/renderer/shaders/Passthrough11.hlsl
-CLEAR_INPUT = $$ANGLE_DIR/src/libGLESv2/renderer/shaders/Clear11.hlsl
+PS_BLIT_INPUT = $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/shaders/Blit.ps
+VS_BLIT_INPUT = $$ANGLE_DIR/src/libGLESv2/renderer/d3d9/shaders/Blit.vs
+PASSTHROUGH_INPUT = $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/shaders/Passthrough11.hlsl
+CLEAR_INPUT = $$ANGLE_DIR/src/libGLESv2/renderer/d3d11/shaders/Clear11.hlsl
 PIXEL_SHADERS_BLIT = passthroughps luminanceps componentmaskps
 PIXEL_SHADERS_PASSTHROUGH = PassthroughRGBA PassthroughRGB \
                             PassthroughLum PassthroughLumAlpha
@@ -178,61 +180,62 @@ PIXEL_SHADERS_CLEAR = ClearSingle ClearMultiple
 VERTEX_SHADERS_BLIT = standardvs flipyvs
 VERTEX_SHADERS_PASSTHROUGH = Passthrough
 VERTEX_SHADERS_CLEAR = Clear
-SHADER_DIR = $$OUT_PWD/renderer/shaders/compiled
+SHADER_DIR_9 = $$OUT_PWD/renderer/d3d9/shaders/compiled
+SHADER_DIR_11 = $$OUT_PWD/renderer/d3d11/shaders/compiled
 
 for (ps, PIXEL_SHADERS_BLIT) {
     fxc_ps_$${ps}.commands = $$FXC /nologo /E $$ps /T ps_2_0 /Fh ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-    fxc_ps_$${ps}.output = $$SHADER_DIR/$${ps}.h
+    fxc_ps_$${ps}.output = $$SHADER_DIR_9/$${ps}.h
     fxc_ps_$${ps}.input = PS_BLIT_INPUT
     fxc_ps_$${ps}.dependency_type = TYPE_C
     fxc_ps_$${ps}.variable_out = HEADERS
     fxc_ps_$${ps}.CONFIG += target_predeps
-    QMAKE_EXTRA_COMPILERS += fxc_ps_$${ps}
+    !winrt: QMAKE_EXTRA_COMPILERS += fxc_ps_$${ps}
 }
 for (ps, PIXEL_SHADERS_PASSTHROUGH) {
     fxc_ps_$${ps}.commands = $$FXC /nologo /E PS_$$ps /T ps_4_0_level_9_1 /Fh ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-    fxc_ps_$${ps}.output = $$SHADER_DIR/$${ps}11ps.h
+    fxc_ps_$${ps}.output = $$SHADER_DIR_11/$${ps}11ps.h
     fxc_ps_$${ps}.input = PASSTHROUGH_INPUT
     fxc_ps_$${ps}.dependency_type = TYPE_C
     fxc_ps_$${ps}.variable_out = HEADERS
     fxc_ps_$${ps}.CONFIG += target_predeps
-    QMAKE_EXTRA_COMPILERS += fxc_ps_$${ps}
+    angle_d3d11: QMAKE_EXTRA_COMPILERS += fxc_ps_$${ps}
 }
 for (ps, PIXEL_SHADERS_CLEAR) {
     fxc_ps_$${ps}.commands = $$FXC /nologo /E PS_$$ps /T ps_4_0_level_9_1 /Fh ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-    fxc_ps_$${ps}.output = $$SHADER_DIR/$${ps}11ps.h
+    fxc_ps_$${ps}.output = $$SHADER_DIR_11/$${ps}11ps.h
     fxc_ps_$${ps}.input = CLEAR_INPUT
     fxc_ps_$${ps}.dependency_type = TYPE_C
     fxc_ps_$${ps}.variable_out = HEADERS
     fxc_ps_$${ps}.CONFIG += target_predeps
-    QMAKE_EXTRA_COMPILERS += fxc_ps_$${ps}
+    angle_d3d11: QMAKE_EXTRA_COMPILERS += fxc_ps_$${ps}
 }
 for (vs, VERTEX_SHADERS_BLIT) {
     fxc_vs_$${vs}.commands = $$FXC /nologo /E $$vs /T vs_2_0 /Fh ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-    fxc_vs_$${vs}.output = $$SHADER_DIR/$${vs}.h
+    fxc_vs_$${vs}.output = $$SHADER_DIR_9/$${vs}.h
     fxc_vs_$${vs}.input = VS_BLIT_INPUT
     fxc_vs_$${vs}.dependency_type = TYPE_C
     fxc_vs_$${vs}.variable_out = HEADERS
     fxc_vs_$${vs}.CONFIG += target_predeps
-    QMAKE_EXTRA_COMPILERS += fxc_vs_$${vs}
+    !winrt: QMAKE_EXTRA_COMPILERS += fxc_vs_$${vs}
 }
 for (vs, VERTEX_SHADERS_PASSTHROUGH) {
     fxc_vs_$${vs}.commands = $$FXC /nologo /E VS_$$vs /T vs_4_0_level_9_1 /Fh ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-    fxc_vs_$${vs}.output = $$SHADER_DIR/$${vs}11vs.h
+    fxc_vs_$${vs}.output = $$SHADER_DIR_11/$${vs}11vs.h
     fxc_vs_$${vs}.input = PASSTHROUGH_INPUT
     fxc_vs_$${vs}.dependency_type = TYPE_C
     fxc_vs_$${vs}.variable_out = HEADERS
     fxc_vs_$${vs}.CONFIG += target_predeps
-    QMAKE_EXTRA_COMPILERS += fxc_vs_$${vs}
+    angle_d3d11: QMAKE_EXTRA_COMPILERS += fxc_vs_$${vs}
 }
 for (vs, VERTEX_SHADERS_CLEAR) {
     fxc_vs_$${vs}.commands = $$FXC /nologo /E VS_$$vs /T vs_4_0_level_9_1 /Fh ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-    fxc_vs_$${vs}.output = $$SHADER_DIR/$${vs}11vs.h
+    fxc_vs_$${vs}.output = $$SHADER_DIR_11/$${vs}11vs.h
     fxc_vs_$${vs}.input = CLEAR_INPUT
     fxc_vs_$${vs}.dependency_type = TYPE_C
     fxc_vs_$${vs}.variable_out = HEADERS
     fxc_vs_$${vs}.CONFIG += target_predeps
-    QMAKE_EXTRA_COMPILERS += fxc_vs_$${vs}
+    angle_d3d11: QMAKE_EXTRA_COMPILERS += fxc_vs_$${vs}
 }
 
 load(qt_installs)