1 files changed, 18 insertions, 38 deletions
diff --git a/gfx/angle/src/libANGLE/moz.build b/gfx/angle/src/libANGLE/moz.build
index e127ccce1..7d12a1ca6 100755
--- a/gfx/angle/src/libANGLE/moz.build
+++ b/gfx/angle/src/libANGLE/moz.build
@@ -29,13 +29,11 @@ UNIFIED_SOURCES += [
     '../compiler/preprocessor/Preprocessor.cpp',
     '../compiler/preprocessor/Token.cpp',
     '../compiler/preprocessor/Tokenizer.cpp',
-    '../compiler/translator/AddAndTrueToLoopCondition.cpp',
     '../compiler/translator/AddDefaultReturnStatements.cpp',
     '../compiler/translator/ArrayReturnValueToOutParameter.cpp',
     '../compiler/translator/ASTMetadataHLSL.cpp',
     '../compiler/translator/blocklayout.cpp',
     '../compiler/translator/blocklayoutHLSL.cpp',
-    '../compiler/translator/BreakVariableAliasingInInnerLoops.cpp',
     '../compiler/translator/BuiltInFunctionEmulator.cpp',
     '../compiler/translator/BuiltInFunctionEmulatorGLSL.cpp',
     '../compiler/translator/BuiltInFunctionEmulatorHLSL.cpp',
@@ -43,8 +41,11 @@ UNIFIED_SOURCES += [
     '../compiler/translator/CallDAG.cpp',
     '../compiler/translator/CodeGen.cpp',
     '../compiler/translator/Compiler.cpp',
-    '../compiler/translator/ConstantUnion.cpp',
     '../compiler/translator/DeferGlobalInitializers.cpp',
+    '../compiler/translator/depgraph/DependencyGraph.cpp',
+    '../compiler/translator/depgraph/DependencyGraphBuilder.cpp',
+    '../compiler/translator/depgraph/DependencyGraphOutput.cpp',
+    '../compiler/translator/depgraph/DependencyGraphTraverse.cpp',
     '../compiler/translator/Diagnostics.cpp',
     '../compiler/translator/DirectiveHandler.cpp',
     '../compiler/translator/EmulatePrecision.cpp',
@@ -71,27 +72,28 @@ UNIFIED_SOURCES += [
     '../compiler/translator/ParseContext.cpp',
     '../compiler/translator/PoolAlloc.cpp',
     '../compiler/translator/PruneEmptyDeclarations.cpp',
-    '../compiler/translator/QualifierTypes.cpp',
     '../compiler/translator/RecordConstantPrecision.cpp',
     '../compiler/translator/RegenerateStructNames.cpp',
     '../compiler/translator/RemoveDynamicIndexing.cpp',
-    '../compiler/translator/RemoveInvariantDeclaration.cpp',
     '../compiler/translator/RemovePow.cpp',
     '../compiler/translator/RemoveSwitchFallThrough.cpp',
     '../compiler/translator/RewriteDoWhile.cpp',
     '../compiler/translator/RewriteElseBlocks.cpp',
-    '../compiler/translator/RewriteUnaryMinusOperatorInt.cpp',
+    '../compiler/translator/RewriteTexelFetchOffset.cpp',
     '../compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp',
     '../compiler/translator/SearchSymbol.cpp',
     '../compiler/translator/SeparateArrayInitialization.cpp',
     '../compiler/translator/SeparateDeclarations.cpp',
     '../compiler/translator/SeparateExpressionsReturningArrays.cpp',
+    '../compiler/translator/ShaderLang.cpp',
     '../compiler/translator/ShaderVars.cpp',
     '../compiler/translator/SimplifyLoopConditions.cpp',
     '../compiler/translator/SplitSequenceOperator.cpp',
     '../compiler/translator/StructureHLSL.cpp',
     '../compiler/translator/SymbolTable.cpp',
     '../compiler/translator/TextureFunctionHLSL.cpp',
+    '../compiler/translator/timing/RestrictFragmentShaderTiming.cpp',
+    '../compiler/translator/timing/RestrictVertexShaderTiming.cpp',
     '../compiler/translator/TranslatorESSL.cpp',
     '../compiler/translator/TranslatorGLSL.cpp',
     '../compiler/translator/TranslatorHLSL.cpp',
@@ -99,7 +101,6 @@ UNIFIED_SOURCES += [
     '../compiler/translator/UnfoldShortCircuitAST.cpp',
     '../compiler/translator/UnfoldShortCircuitToIf.cpp',
     '../compiler/translator/UniformHLSL.cpp',
-    '../compiler/translator/UseInterfaceBlockFields.cpp',
     '../compiler/translator/util.cpp',
     '../compiler/translator/UtilsHLSL.cpp',
     '../compiler/translator/ValidateGlobalInitializer.cpp',
@@ -128,9 +129,7 @@ UNIFIED_SOURCES += [
     'Debug.cpp',
     'Device.cpp',
     'Error.cpp',
-    'es3_copy_conversion_table_autogen.cpp',
     'Fence.cpp',
-    'format_map_autogen.cpp',
     'formatutils.cpp',
     'Framebuffer.cpp',
     'FramebufferAttachment.cpp',
@@ -144,7 +143,6 @@ UNIFIED_SOURCES += [
     'Program.cpp',
     'Query.cpp',
     'queryconversions.cpp',
-    'queryutils.cpp',
     'Renderbuffer.cpp',
     'renderer/ContextImpl.cpp',
     'renderer/d3d/BufferD3D.cpp',
@@ -184,15 +182,14 @@ UNIFIED_SOURCES += [
     'renderer/d3d/ShaderD3D.cpp',
     'renderer/d3d/ShaderExecutableD3D.cpp',
     'renderer/d3d/SurfaceD3D.cpp',
-    'renderer/d3d/SwapChainD3D.cpp',
     'renderer/d3d/TextureD3D.cpp',
     'renderer/d3d/VaryingPacking.cpp',
     'renderer/d3d/VertexBuffer.cpp',
     'renderer/d3d/VertexDataManager.cpp',
     'renderer/DeviceImpl.cpp',
     'renderer/DisplayImpl.cpp',
-    'renderer/driver_utils.cpp',
-    'renderer/Format_table_autogen.cpp',
+    'renderer/Format.cpp',
+    'renderer/Format_autogen.cpp',
     'renderer/gl/BlitGL.cpp',
     'renderer/gl/BufferGL.cpp',
     'renderer/gl/CompilerGL.cpp',
@@ -216,7 +213,6 @@ UNIFIED_SOURCES += [
     'renderer/gl/TextureGL.cpp',
     'renderer/gl/TransformFeedbackGL.cpp',
     'renderer/gl/VertexArrayGL.cpp',
-    'renderer/gl/wgl/D3DTextureSurfaceWGL.cpp',
     'renderer/gl/wgl/DisplayWGL.cpp',
     'renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp',
     'renderer/gl/wgl/FunctionsWGL.cpp',
@@ -224,25 +220,6 @@ UNIFIED_SOURCES += [
     'renderer/gl/wgl/wgl_utils.cpp',
     'renderer/gl/wgl/WindowSurfaceWGL.cpp',
     'renderer/load_functions_table_autogen.cpp',
-    'renderer/null/BufferNULL.cpp',
-    'renderer/null/CompilerNULL.cpp',
-    'renderer/null/ContextNULL.cpp',
-    'renderer/null/DeviceNULL.cpp',
-    'renderer/null/DisplayNULL.cpp',
-    'renderer/null/FenceNVNULL.cpp',
-    'renderer/null/FenceSyncNULL.cpp',
-    'renderer/null/FramebufferNULL.cpp',
-    'renderer/null/ImageNULL.cpp',
-    'renderer/null/PathNULL.cpp',
-    'renderer/null/ProgramNULL.cpp',
-    'renderer/null/QueryNULL.cpp',
-    'renderer/null/RenderbufferNULL.cpp',
-    'renderer/null/SamplerNULL.cpp',
-    'renderer/null/ShaderNULL.cpp',
-    'renderer/null/SurfaceNULL.cpp',
-    'renderer/null/TextureNULL.cpp',
-    'renderer/null/TransformFeedbackNULL.cpp',
-    'renderer/null/VertexArrayNULL.cpp',
     'renderer/renderer_utils.cpp',
     'renderer/SurfaceImpl.cpp',
     'renderer/TextureImpl.cpp',
@@ -273,7 +250,6 @@ UNIFIED_SOURCES += [
     'Stream.cpp',
     'Surface.cpp',
     'Texture.cpp',
-    'Thread.cpp',
     'TransformFeedback.cpp',
     'Uniform.cpp',
     'validationEGL.cpp',
@@ -288,8 +264,6 @@ SOURCES += [
     '../compiler/translator/EmulateGLFragColorBroadcast.cpp',
     '../compiler/translator/glslang_lex.cpp',
     '../compiler/translator/glslang_tab.cpp',
-    '../compiler/translator/RewriteTexelFetchOffset.cpp',
-    '../compiler/translator/ShaderLang.cpp',
     'Display.cpp',
     'renderer/d3d/DisplayD3D.cpp',
     'renderer/d3d/HLSLCompiler.cpp',
@@ -301,7 +275,6 @@ if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
         'renderer/d3d/d3d11/Clear11.cpp',
         'renderer/d3d/d3d11/Context11.cpp',
         'renderer/d3d/d3d11/DebugAnnotator11.cpp',
-        'renderer/d3d/d3d11/dxgi_format_map_autogen.cpp',
         'renderer/d3d/d3d11/dxgi_support_table.cpp',
         'renderer/d3d/d3d11/Fence11.cpp',
         'renderer/d3d/d3d11/formatutils11.cpp',
@@ -332,7 +305,6 @@ if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
         'renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp',
     ]
 
-CXXFLAGS += CONFIG['SSE2_FLAGS']
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += [
@@ -353,6 +325,9 @@ if CONFIG['GNU_CXX']:
             '-Wno-shadow-local',
         ]
 
+if CONFIG['MOZ_DIRECTX_SDK_PATH'] and not CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
+    LOCAL_INCLUDES += ['%' + '%s/include/' % CONFIG['MOZ_DIRECTX_SDK_PATH']]
+
 DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
 DEFINES['_HAS_EXCEPTIONS'] = 0
 
@@ -385,6 +360,11 @@ DEFINES['ANGLE_DEFAULT_D3D11'] = "0"
 
 if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
   OS_LIBS += [ 'd3d9', 'dxguid' ]
+else:
+  EXTRA_DSO_LDOPTS += [
+    '\'%s/lib/%s/d3d9.lib\'' % (CONFIG['MOZ_DIRECTX_SDK_PATH'], CONFIG['MOZ_D3D_CPU_SUFFIX']),
+    '\'%s/lib/%s/dxguid.lib\'' % (CONFIG['MOZ_DIRECTX_SDK_PATH'], CONFIG['MOZ_D3D_CPU_SUFFIX']),
+  ]
 
 Library('libANGLE')