3 files changed, 72 insertions, 26 deletions
diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri
index 83cd1e8687..9eae06d410 100644
--- a/src/angle/src/common/common.pri
+++ b/src/angle/src/common/common.pri
@@ -21,7 +21,7 @@ lib_replace.CONFIG = path
 QMAKE_PRL_INSTALL_REPLACE += lib_replace
 
 # DirectX is included in the Windows 8 Kit, but everything else requires the DX SDK.
-winrt|if(msvc:!win32-msvc2005:!win32-msvc2008:!win32-msvc2010) {
+winrt|msvc {
     FXC = fxc.exe
 } else {
     DX_DIR = $$(DXSDK_DIR)
diff --git a/src/angle/src/compiler/translator.pro b/src/angle/src/compiler/translator.pro
index 31aeae92b0..d48ac70472 100644
--- a/src/angle/src/compiler/translator.pro
+++ b/src/angle/src/compiler/translator.pro
@@ -21,21 +21,22 @@ HEADERS += \
     $$ANGLE_DIR/src/common/platform.h \
     $$ANGLE_DIR/src/common/tls.h \
     $$ANGLE_DIR/src/common/utilities.h \
+    $$ANGLE_DIR/src/compiler/translator/ArrayReturnValueToOutParameter.h \
+    $$ANGLE_DIR/src/compiler/translator/ASTMetadataHLSL.h \
     $$ANGLE_DIR/src/compiler/translator/blocklayout.h \
     $$ANGLE_DIR/src/compiler/translator/blocklayoutHLSL.h \
     $$ANGLE_DIR/src/compiler/translator/BaseTypes.h \
     $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulator.h \
     $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulatorGLSL.h \
     $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulatorHLSL.h \
+    $$ANGLE_DIR/src/compiler/translator/Cache.h \
+    $$ANGLE_DIR/src/compiler/translator/CallDAG.h \
     $$ANGLE_DIR/src/compiler/translator/Common.h \
-    $$ANGLE_DIR/src/compiler/translator/compilerdebug.h \
     $$ANGLE_DIR/src/compiler/translator/Compiler.h \
     $$ANGLE_DIR/src/compiler/translator/ConstantUnion.h \
     $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraphBuilder.h \
     $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraph.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 \
@@ -61,16 +62,21 @@ HEADERS += \
     $$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/PruneEmptyDeclarations.h \
     $$ANGLE_DIR/src/compiler/translator/Pragma.h \
-    $$ANGLE_DIR/src/compiler/translator/QualifierAlive.h \
     $$ANGLE_DIR/src/compiler/translator/RegenerateStructNames.h \
+    $$ANGLE_DIR/src/compiler/translator/RemovePow.h \
+    $$ANGLE_DIR/src/compiler/translator/RemoveDynamicIndexing.h \
     $$ANGLE_DIR/src/compiler/translator/RemoveSwitchFallThrough.h \
     $$ANGLE_DIR/src/compiler/translator/RenameFunction.h \
+    $$ANGLE_DIR/src/compiler/translator/RewriteDoWhile.h \
     $$ANGLE_DIR/src/compiler/translator/RewriteElseBlocks.h \
+    $$ANGLE_DIR/src/compiler/translator/SeparateArrayInitialization.h \
+    $$ANGLE_DIR/src/compiler/translator/SeparateDeclarations.h \
     $$ANGLE_DIR/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.h \
     $$ANGLE_DIR/src/compiler/translator/SearchSymbol.h \
     $$ANGLE_DIR/src/compiler/translator/ShHandle.h \
-    $$ANGLE_DIR/src/compiler/translator/SimplifyArrayAssignment.h \
+    $$ANGLE_DIR/src/compiler/translator/SeparateExpressionsReturningArrays.h \
     $$ANGLE_DIR/src/compiler/translator/StructureHLSL.h \
     $$ANGLE_DIR/src/compiler/translator/SymbolTable.h \
     $$ANGLE_DIR/src/compiler/translator/timing/RestrictFragmentShaderTiming.h \
@@ -80,10 +86,11 @@ HEADERS += \
     $$ANGLE_DIR/src/compiler/translator/TranslatorHLSL.h \
     $$ANGLE_DIR/src/compiler/translator/Types.h \
     $$ANGLE_DIR/src/compiler/translator/UnfoldShortCircuitAST.h \
-    $$ANGLE_DIR/src/compiler/translator/UnfoldShortCircuit.h \
+    $$ANGLE_DIR/src/compiler/translator/UnfoldShortCircuitToIf.h \
     $$ANGLE_DIR/src/compiler/translator/UniformHLSL.h \
     $$ANGLE_DIR/src/compiler/translator/util.h \
     $$ANGLE_DIR/src/compiler/translator/UtilsHLSL.h \
+    $$ANGLE_DIR/src/compiler/translator/ValidateGlobalInitializer.h \
     $$ANGLE_DIR/src/compiler/translator/ValidateLimitations.h \
     $$ANGLE_DIR/src/compiler/translator/ValidateOutputs.h \
     $$ANGLE_DIR/src/compiler/translator/ValidateSwitch.h \
@@ -94,21 +101,23 @@ HEADERS += \
 
 
 SOURCES += \
+    $$ANGLE_DIR/src/common/debug.cpp \
     $$ANGLE_DIR/src/common/tls.cpp \
+    $$ANGLE_DIR/src/compiler/translator/ArrayReturnValueToOutParameter.cpp \
+    $$ANGLE_DIR/src/compiler/translator/ASTMetadataHLSL.cpp \
     $$ANGLE_DIR/src/compiler/translator/blocklayout.cpp \
     $$ANGLE_DIR/src/compiler/translator/blocklayoutHLSL.cpp \
     $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulator.cpp \
     $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp \
     $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp \
+    $$ANGLE_DIR/src/compiler/translator/Cache.cpp \
+    $$ANGLE_DIR/src/compiler/translator/CallDAG.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/EmulatePrecision.cpp \
@@ -129,18 +138,22 @@ SOURCES += \
     $$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/PruneEmptyDeclarations.cpp \
     $$ANGLE_DIR/src/compiler/translator/RegenerateStructNames.cpp \
+    $$ANGLE_DIR/src/compiler/translator/RemovePow.cpp \
+    $$ANGLE_DIR/src/compiler/translator/RemoveDynamicIndexing.cpp \
     $$ANGLE_DIR/src/compiler/translator/RemoveSwitchFallThrough.cpp \
+    $$ANGLE_DIR/src/compiler/translator/RewriteDoWhile.cpp \
     $$ANGLE_DIR/src/compiler/translator/RewriteElseBlocks.cpp \
+    $$ANGLE_DIR/src/compiler/translator/SeparateArrayInitialization.cpp \
+    $$ANGLE_DIR/src/compiler/translator/SeparateDeclarations.cpp \
     $$ANGLE_DIR/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp \
     $$ANGLE_DIR/src/compiler/translator/SearchSymbol.cpp \
     $$ANGLE_DIR/src/compiler/translator/ShaderLang.cpp \
     $$ANGLE_DIR/src/compiler/translator/ShaderVars.cpp \
-    $$ANGLE_DIR/src/compiler/translator/SimplifyArrayAssignment.cpp \
+    $$ANGLE_DIR/src/compiler/translator/SeparateExpressionsReturningArrays.cpp \
     $$ANGLE_DIR/src/compiler/translator/StructureHLSL.cpp \
     $$ANGLE_DIR/src/compiler/translator/SymbolTable.cpp \
     $$ANGLE_DIR/src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp \
@@ -149,11 +162,12 @@ SOURCES += \
     $$ANGLE_DIR/src/compiler/translator/TranslatorGLSL.cpp \
     $$ANGLE_DIR/src/compiler/translator/TranslatorHLSL.cpp \
     $$ANGLE_DIR/src/compiler/translator/Types.cpp \
-    $$ANGLE_DIR/src/compiler/translator/UnfoldShortCircuit.cpp \
+    $$ANGLE_DIR/src/compiler/translator/UnfoldShortCircuitToIf.cpp \
     $$ANGLE_DIR/src/compiler/translator/UnfoldShortCircuitAST.cpp \
     $$ANGLE_DIR/src/compiler/translator/UniformHLSL.cpp \
     $$ANGLE_DIR/src/compiler/translator/UtilsHLSL.cpp \
     $$ANGLE_DIR/src/compiler/translator/util.cpp \
+    $$ANGLE_DIR/src/compiler/translator/ValidateGlobalInitializer.cpp \
     $$ANGLE_DIR/src/compiler/translator/ValidateLimitations.cpp \
     $$ANGLE_DIR/src/compiler/translator/ValidateOutputs.cpp \
     $$ANGLE_DIR/src/compiler/translator/ValidateSwitch.cpp \
diff --git a/src/angle/src/libGLESv2/libGLESv2.pro b/src/angle/src/libGLESv2/libGLESv2.pro
index a7a70da241..b699ae159a 100644
--- a/src/angle/src/libGLESv2/libGLESv2.pro
+++ b/src/angle/src/libGLESv2/libGLESv2.pro
@@ -1,4 +1,4 @@
-CONFIG += simd
+CONFIG += simd no_batch
 include(../common/common.pri)
 DEF_FILE_TARGET=$${TARGET}
 TARGET=$$qtLibraryTarget($${LIBGLESV2_NAME})
@@ -26,6 +26,7 @@ DEFINES += LIBANGLE_IMPLEMENTATION LIBGLESV2_IMPLEMENTATION GL_APICALL= GL_GLEXT
 !winrt: DEFINES += ANGLE_ENABLE_D3D9 ANGLE_SKIP_DXGI_1_2_CHECK
 
 HEADERS += \
+    $$ANGLE_DIR/src/common/mathutil.h \
     $$ANGLE_DIR/src/common/blocklayout.h \
     $$ANGLE_DIR/src/common/NativeWindow.h \
     $$ANGLE_DIR/src/common/shadervars.h \
@@ -44,6 +45,7 @@ HEADERS += \
     $$ANGLE_DIR/src/libANGLE/Constants.h \
     $$ANGLE_DIR/src/libANGLE/Context.h \
     $$ANGLE_DIR/src/libANGLE/Data.h \
+    $$ANGLE_DIR/src/libANGLE/Device.h \
     $$ANGLE_DIR/src/libANGLE/Display.h \
     $$ANGLE_DIR/src/libANGLE/Error.h \
     $$ANGLE_DIR/src/libANGLE/features.h \
@@ -53,6 +55,7 @@ HEADERS += \
     $$ANGLE_DIR/src/libANGLE/FramebufferAttachment.h \
     $$ANGLE_DIR/src/libANGLE/HandleAllocator.h \
     $$ANGLE_DIR/src/libANGLE/ImageIndex.h \
+    $$ANGLE_DIR/src/libANGLE/IndexRangeCache.h \
     $$ANGLE_DIR/src/libANGLE/Program.h \
     $$ANGLE_DIR/src/libANGLE/Query.h \
     $$ANGLE_DIR/src/libANGLE/queryconversions.h \
@@ -75,8 +78,10 @@ HEADERS += \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/BufferD3D.h \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/CompilerD3D.h \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/copyimage.h \
+    $$ANGLE_DIR/src/libANGLE/renderer/d3d/DeviceD3D.h \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/DisplayD3D.h \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/DynamicHLSL.h \
+    $$ANGLE_DIR/src/libANGLE/renderer/d3d/EGLImageD3D.h \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/formatutilsD3D.h \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/FramebufferD3D.h \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/generatemip.h \
@@ -86,6 +91,7 @@ HEADERS += \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/IndexBuffer.h \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/IndexDataManager.h \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/loadimage.h \
+    $$ANGLE_DIR/src/libANGLE/renderer/d3d/loadimage_etc.h \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/ProgramD3D.h \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/RenderbufferD3D.h \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/RendererD3D.h \
@@ -97,17 +103,18 @@ HEADERS += \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/TextureD3D.h \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/TextureStorage.h \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/TransformFeedbackD3D.h \
+    $$ANGLE_DIR/src/libANGLE/renderer/d3d/VaryingPacking.h \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/VertexBuffer.h \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/VertexDataManager.h \
     $$ANGLE_DIR/src/libANGLE/renderer/BufferImpl.h \
     $$ANGLE_DIR/src/libANGLE/renderer/CompilerImpl.h \
+    $$ANGLE_DIR/src/libANGLE/renderer/DeviceImpl.h \
     $$ANGLE_DIR/src/libANGLE/renderer/DisplayImpl.h \
     $$ANGLE_DIR/src/libANGLE/renderer/FenceNVImpl.h \
     $$ANGLE_DIR/src/libANGLE/renderer/FenceSyncImpl.h \
     $$ANGLE_DIR/src/libANGLE/renderer/FramebufferImpl.h \
     $$ANGLE_DIR/src/libANGLE/renderer/Image.h \
     $$ANGLE_DIR/src/libANGLE/renderer/ImplFactory.h \
-    $$ANGLE_DIR/src/libANGLE/renderer/IndexRangeCache.h \
     $$ANGLE_DIR/src/libANGLE/renderer/ProgramImpl.h \
     $$ANGLE_DIR/src/libANGLE/renderer/QueryImpl.h \
     $$ANGLE_DIR/src/libANGLE/renderer/RenderbufferImpl.h \
@@ -149,6 +156,7 @@ SOURCES += \
     $$ANGLE_DIR/src/common/angleutils.cpp \
     $$ANGLE_DIR/src/common/debug.cpp \
     $$ANGLE_DIR/src/common/event_tracer.cpp \
+    $$ANGLE_DIR/src/common/Float16ToFloat32.cpp \
     $$ANGLE_DIR/src/third_party/murmurhash/MurmurHash3.cpp \
     $$ANGLE_DIR/src/libANGLE/angletypes.cpp \
     $$ANGLE_DIR/src/libANGLE/AttributeMap.cpp \
@@ -158,20 +166,21 @@ SOURCES += \
     $$ANGLE_DIR/src/libANGLE/Config.cpp \
     $$ANGLE_DIR/src/libANGLE/Context.cpp \
     $$ANGLE_DIR/src/libANGLE/Data.cpp \
+    $$ANGLE_DIR/src/libANGLE/Device.cpp \
     $$ANGLE_DIR/src/libANGLE/Display.cpp \
     $$ANGLE_DIR/src/libANGLE/Error.cpp \
     $$ANGLE_DIR/src/libANGLE/Fence.cpp \
-    $$ANGLE_DIR/src/libANGLE/Float16ToFloat32.cpp \
     $$ANGLE_DIR/src/libANGLE/formatutils.cpp \
     $$ANGLE_DIR/src/libANGLE/Framebuffer.cpp \
     $$ANGLE_DIR/src/libANGLE/FramebufferAttachment.cpp \
     $$ANGLE_DIR/src/libANGLE/HandleAllocator.cpp \
+    $$ANGLE_DIR/src/libANGLE/Image.cpp \
     $$ANGLE_DIR/src/libANGLE/ImageIndex.cpp \
+    $$ANGLE_DIR/src/libANGLE/IndexRangeCache.cpp \
     $$ANGLE_DIR/src/libANGLE/Platform.cpp \
     $$ANGLE_DIR/src/libANGLE/Program.cpp \
     $$ANGLE_DIR/src/libANGLE/Query.cpp \
     $$ANGLE_DIR/src/libANGLE/queryconversions.cpp \
-    $$ANGLE_DIR/src/libANGLE/RefCountObject.cpp \
     $$ANGLE_DIR/src/libANGLE/Renderbuffer.cpp \
     $$ANGLE_DIR/src/libANGLE/ResourceManager.cpp \
     $$ANGLE_DIR/src/libANGLE/Sampler.cpp \
@@ -187,17 +196,17 @@ SOURCES += \
     $$ANGLE_DIR/src/libANGLE/validationES3.cpp \
     $$ANGLE_DIR/src/libANGLE/VertexArray.cpp \
     $$ANGLE_DIR/src/libANGLE/VertexAttribute.cpp \
+    $$ANGLE_DIR/src/libANGLE/renderer/DeviceImpl.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/DisplayImpl.cpp \
-    $$ANGLE_DIR/src/libANGLE/renderer/IndexRangeCache.cpp \
-    $$ANGLE_DIR/src/libANGLE/renderer/ProgramImpl.cpp \
-    $$ANGLE_DIR/src/libANGLE/renderer/RenderbufferImpl.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/Renderer.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/SurfaceImpl.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/BufferD3D.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/CompilerD3D.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/copyimage.cpp \
+    $$ANGLE_DIR/src/libANGLE/renderer/d3d/DeviceD3D.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/DisplayD3D.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/DynamicHLSL.cpp \
+    $$ANGLE_DIR/src/libANGLE/renderer/d3d/EGLImageD3D.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/formatutilsD3D.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/FramebufferD3D.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/HLSLCompiler.cpp \
@@ -205,6 +214,7 @@ SOURCES += \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/IndexBuffer.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/IndexDataManager.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/loadimage.cpp \
+    $$ANGLE_DIR/src/libANGLE/renderer/d3d/loadimage_etc.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/ProgramD3D.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/RenderbufferD3D.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/RendererD3D.cpp \
@@ -213,8 +223,8 @@ SOURCES += \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/SurfaceD3D.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/TextureD3D.cpp \
-    $$ANGLE_DIR/src/libANGLE/renderer/d3d/TextureStorage.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/TransformFeedbackD3D.cpp \
+    $$ANGLE_DIR/src/libANGLE/renderer/d3d/VaryingPacking.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/VertexBuffer.cpp \
     $$ANGLE_DIR/src/libANGLE/renderer/d3d/VertexDataManager.cpp \
     $$ANGLE_DIR/src/libGLESv2/entry_points_egl.cpp \
@@ -228,18 +238,29 @@ SOURCES += \
 
 SSE2_SOURCES += $$ANGLE_DIR/src/libANGLE/renderer/d3d/loadimageSSE2.cpp
 
+DEBUG_SOURCE = $$ANGLE_DIR/src/libANGLE/Debug.cpp
+debug_copy.input = DEBUG_SOURCE
+debug_copy.output = $$ANGLE_DIR/src/libANGLE/Debug2.cpp
+debug_copy.commands = $$QMAKE_COPY \"${QMAKE_FILE_IN}\" \"${QMAKE_FILE_OUT}\"
+debug_copy.variable_out = GENERATED_SOURCES
+debug_copy.CONFIG = target_predeps
+QMAKE_EXTRA_COMPILERS += debug_copy
+
 angle_d3d11 {
     HEADERS += \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Blit11.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Buffer11.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Clear11.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h \
+        $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Fence11.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/formatutils11.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Image11.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h \
+        $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/internal_format_initializer_table.h \
+        $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/load_functions_table.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Query11.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Renderer11.h \
@@ -247,9 +268,12 @@ angle_d3d11 {
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h \
+        $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/StateManager11.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/SwapChain11.h \
+        $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/swizzle_format_info.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Trim11.h \
+        $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/texture_format_table.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h
 
     SOURCES += \
@@ -257,12 +281,15 @@ angle_d3d11 {
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp \
+        $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Fence11.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Image11.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp \
+        $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/internal_format_initializer_table.cpp \
+        $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/load_functions_table_autogen.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Query11.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp \
@@ -270,9 +297,12 @@ angle_d3d11 {
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp \
+        $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp \
+        $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/swizzle_format_info_autogen.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/Trim11.cpp \
+        $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
 }
 
@@ -291,6 +321,7 @@ angle_d3d11 {
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.h \
+        $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d9/StateManager9.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d9/SwapChain9.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.h \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h \
@@ -310,6 +341,7 @@ angle_d3d11 {
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp \
+        $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp \
         $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp \
@@ -335,10 +367,10 @@ angle_d3d11 {
     DEFINES += DllMain=DllMain_ANGLE # prevent symbol from conflicting with the user's DllMain
 }
 
-float_converter.target = float_converter
-float_converter.commands = python $$ANGLE_DIR/src/libANGLE/Float16ToFloat32.py \
-                > $$ANGLE_DIR/src/libANGLE/Float16ToFloat32.cpp
-QMAKE_EXTRA_TARGETS += float_converter
+#load_functions.target = load_functions
+#load_functions.commands = python $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/gen_load_functions_table.py \
+#                > $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d11/gen_load_functions_table.cpp
+#QMAKE_EXTRA_TARGETS += load_functions
 
 # HLSL shaders
 BLITVS = $$ANGLE_DIR/src/libANGLE/renderer/d3d/d3d9/shaders/Blit.vs