--- a/gfx/angle/moz.build
+++ b/gfx/angle/moz.build
@@ -10,31 +10,30 @@
#
UNIFIED_SOURCES += [
'src/common/angleutils.cpp',
'src/common/debug.cpp',
'src/common/Float16ToFloat32.cpp',
'src/common/mathutil.cpp',
'src/common/MemoryBuffer.cpp',
'src/common/string_utils.cpp',
- 'src/common/third_party/murmurhash/MurmurHash3.cpp',
+ 'src/common/third_party/base/anglebase/sha1.cc',
'src/common/tls.cpp',
'src/common/uniform_type_info_autogen.cpp',
'src/common/utilities.cpp',
'src/compiler/preprocessor/DiagnosticsBase.cpp',
'src/compiler/preprocessor/DirectiveHandlerBase.cpp',
'src/compiler/preprocessor/DirectiveParser.cpp',
'src/compiler/preprocessor/ExpressionParser.cpp',
'src/compiler/preprocessor/Input.cpp',
'src/compiler/preprocessor/Lexer.cpp',
'src/compiler/preprocessor/Macro.cpp',
'src/compiler/preprocessor/MacroExpander.cpp',
'src/compiler/preprocessor/Preprocessor.cpp',
'src/compiler/preprocessor/Token.cpp',
- 'src/compiler/preprocessor/Tokenizer.cpp',
'src/compiler/translator/AddAndTrueToLoopCondition.cpp',
'src/compiler/translator/AddDefaultReturnStatements.cpp',
'src/compiler/translator/ArrayReturnValueToOutParameter.cpp',
'src/compiler/translator/ASTMetadataHLSL.cpp',
'src/compiler/translator/blocklayout.cpp',
'src/compiler/translator/blocklayoutHLSL.cpp',
'src/compiler/translator/BreakVariableAliasingInInnerLoops.cpp',
'src/compiler/translator/BuiltInFunctionEmulator.cpp',
@@ -110,30 +109,31 @@ UNIFIED_SOURCES += [
'src/compiler/translator/UnfoldShortCircuitToIf.cpp',
'src/compiler/translator/UniformHLSL.cpp',
'src/compiler/translator/UseInterfaceBlockFields.cpp',
'src/compiler/translator/util.cpp',
'src/compiler/translator/UtilsHLSL.cpp',
'src/compiler/translator/ValidateGlobalInitializer.cpp',
'src/compiler/translator/ValidateLimitations.cpp',
'src/compiler/translator/ValidateMaxParameters.cpp',
- 'src/compiler/translator/ValidateOutputs.cpp',
'src/compiler/translator/ValidateSwitch.cpp',
'src/compiler/translator/ValidateVaryingLocations.cpp',
'src/compiler/translator/VariablePacker.cpp',
'src/compiler/translator/VersionGLSL.cpp',
'src/third_party/compiler/ArrayBoundsClamper.cpp',
]
SOURCES += [
+ 'src/compiler/preprocessor/Tokenizer.cpp',
'src/compiler/translator/EmulateGLFragColorBroadcast.cpp',
'src/compiler/translator/glslang_lex.cpp',
'src/compiler/translator/glslang_tab.cpp',
'src/compiler/translator/RewriteTexelFetchOffset.cpp',
'src/compiler/translator/RewriteUnaryMinusOperatorInt.cpp',
'src/compiler/translator/ShaderLang.cpp',
+ 'src/compiler/translator/ValidateOutputs.cpp',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
UNIFIED_SOURCES += [
'src/common/system_utils_mac.cpp',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
UNIFIED_SOURCES += [
'src/common/system_utils_win.cpp',
@@ -189,14 +189,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
DEFINES['ANGLE_ENABLE_HLSL'] = "1"
DEFINES['ANGLE_ENABLE_GLSL'] = "1"
DEFINES['ANGLE_ENABLE_ESSL'] = "1"
DEFINES['ANGLE_ENABLE_KEYEDMUTEX'] = "1"
EXPORTS.angle += [ 'include/GLSLANG/ShaderLang.h', 'include/GLSLANG/ShaderVars.h', 'include/platform/Platform.h' ]
EXPORTS.angle.KHR += [ 'include/KHR/khrplatform.h' ]
-LOCAL_INCLUDES += [ 'include', 'src', 'src/common/third_party/numerics' ]
+LOCAL_INCLUDES += [ 'include', 'src', 'src/common/third_party/base']
# We allow warnings for third-party code that can be updated from upstream.
ALLOW_COMPILER_WARNINGS = True
FINAL_LIBRARY = 'gkmedias'
--- a/gfx/angle/src/libANGLE/moz.build
+++ b/gfx/angle/src/libANGLE/moz.build
@@ -12,31 +12,31 @@ UNIFIED_SOURCES += [
'../common/angleutils.cpp',
'../common/debug.cpp',
'../common/event_tracer.cpp',
'../common/Float16ToFloat32.cpp',
'../common/mathutil.cpp',
'../common/MemoryBuffer.cpp',
'../common/string_utils.cpp',
'../common/system_utils_win.cpp',
+ '../common/third_party/base/anglebase/sha1.cc',
'../common/third_party/murmurhash/MurmurHash3.cpp',
'../common/tls.cpp',
'../common/uniform_type_info_autogen.cpp',
'../common/utilities.cpp',
'../compiler/preprocessor/DiagnosticsBase.cpp',
'../compiler/preprocessor/DirectiveHandlerBase.cpp',
'../compiler/preprocessor/DirectiveParser.cpp',
'../compiler/preprocessor/ExpressionParser.cpp',
'../compiler/preprocessor/Input.cpp',
'../compiler/preprocessor/Lexer.cpp',
'../compiler/preprocessor/Macro.cpp',
'../compiler/preprocessor/MacroExpander.cpp',
'../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',
@@ -112,22 +112,22 @@ UNIFIED_SOURCES += [
'../compiler/translator/UnfoldShortCircuitToIf.cpp',
'../compiler/translator/UniformHLSL.cpp',
'../compiler/translator/UseInterfaceBlockFields.cpp',
'../compiler/translator/util.cpp',
'../compiler/translator/UtilsHLSL.cpp',
'../compiler/translator/ValidateGlobalInitializer.cpp',
'../compiler/translator/ValidateLimitations.cpp',
'../compiler/translator/ValidateMaxParameters.cpp',
- '../compiler/translator/ValidateOutputs.cpp',
'../compiler/translator/ValidateSwitch.cpp',
'../compiler/translator/ValidateVaryingLocations.cpp',
'../compiler/translator/VariablePacker.cpp',
'../compiler/translator/VersionGLSL.cpp',
'../third_party/compiler/ArrayBoundsClamper.cpp',
+ '../third_party/systeminfo/SystemInfo.cpp',
'angletypes.cpp',
'AttributeMap.cpp',
'Buffer.cpp',
'Caps.cpp',
'Compiler.cpp',
'Config.cpp',
'Context.cpp',
'ContextState.cpp',
@@ -274,29 +274,30 @@ UNIFIED_SOURCES += [
'validationES3.cpp',
'validationES31.cpp',
'VaryingPacking.cpp',
'VertexArray.cpp',
'VertexAttribute.cpp',
'WorkerThread.cpp',
]
SOURCES += [
+ '../compiler/preprocessor/Tokenizer.cpp',
'../compiler/translator/EmulateGLFragColorBroadcast.cpp',
'../compiler/translator/glslang_lex.cpp',
'../compiler/translator/glslang_tab.cpp',
'../compiler/translator/RewriteTexelFetchOffset.cpp',
'../compiler/translator/RewriteUnaryMinusOperatorInt.cpp',
'../compiler/translator/ShaderLang.cpp',
+ '../compiler/translator/ValidateOutputs.cpp',
'../gpu_info_util/SystemInfo.cpp',
'../gpu_info_util/SystemInfo_win.cpp',
'../image_util/copyimage.cpp',
'../image_util/imageformats.cpp',
'../image_util/loadimage.cpp',
'../image_util/loadimage_etc.cpp',
- '../third_party/systeminfo/SystemInfo.cpp',
'Display.cpp',
'renderer/d3d/DisplayD3D.cpp',
'renderer/d3d/HLSLCompiler.cpp',
'renderer/gl/FramebufferGL.cpp',
]
if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
UNIFIED_SOURCES += [
'renderer/d3d/d3d11/Blit11.cpp',
@@ -325,21 +326,21 @@ if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
'renderer/d3d/d3d11/StreamProducerNV12.cpp',
'renderer/d3d/d3d11/texture_format_table.cpp',
'renderer/d3d/d3d11/texture_format_table_autogen.cpp',
'renderer/d3d/d3d11/TextureStorage11.cpp',
'renderer/d3d/d3d11/TransformFeedback11.cpp',
'renderer/d3d/d3d11/Trim11.cpp',
'renderer/d3d/d3d11/VertexArray11.cpp',
'renderer/d3d/d3d11/VertexBuffer11.cpp',
- 'renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp',
]
if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
SOURCES += [
'renderer/d3d/d3d11/SwapChain11.cpp',
+ 'renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp',
]
if CONFIG['GNU_CXX']:
CXXFLAGS += [
'-Wno-attributes',
'-Wno-shadow',
'-Wno-sign-compare',
@@ -376,17 +377,17 @@ DEFINES['ANGLE_NO_EXCEPTIONS'] = True
# We need these defined to nothing so that we don't get bogus dllimport declspecs
DEFINES['GL_APICALL'] = ""
DEFINES['GL_GLEXT_PROTOTYPES'] = ""
DEFINES['EGLAPI'] = ""
-LOCAL_INCLUDES += [ '../../include', '../../src', '../../src/common/third_party/numerics', '../../src/third_party/khronos', '../../src/third_party/mrucache' ]
+LOCAL_INCLUDES += [ '../../include', '../../src', '../../src/common/third_party/base', '../../src/third_party/khronos', ]
DEFINES['LIBANGLE_IMPLEMENTATION'] = "1"
DEFINES['ANGLE_ENABLE_HLSL'] = "1"
DEFINES['ANGLE_ENABLE_KEYEDMUTEX'] = "1"
DEFINES['ANGLE_DEFAULT_D3D11'] = "0"
DEFINES['GPU_INFO_USE_SETUPAPI'] = True
DEFINES['NTDDI_VERSION'] = 0x06020000
--- a/gfx/angle/src/libEGL/moz.build
+++ b/gfx/angle/src/libEGL/moz.build
@@ -51,17 +51,17 @@ DEFINES['ANGLE_NO_EXCEPTIONS'] = True
# We need these defined to nothing so that we don't get bogus dllimport declspecs
DEFINES['GL_APICALL'] = ""
DEFINES['GL_GLEXT_PROTOTYPES'] = ""
DEFINES['EGLAPI'] = ""
-LOCAL_INCLUDES += [ '../../include', '../../src', '../../src/third_party/khronos' ]
+LOCAL_INCLUDES += [ '../../include', '../../src', '../../src/common/third_party/base', '../../src/third_party/khronos' ]
USE_LIBS += [ 'libGLESv2' ]
DEFINES['LIBANGLE_IMPLEMENTATION'] = "1"
DEFINES['ANGLE_ENABLE_HLSL'] = "1"
DEFINES['ANGLE_ENABLE_KEYEDMUTEX'] = "1"
if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
OS_LIBS += [ 'd3d9', 'dxguid' ]
--- a/gfx/angle/src/libGLESv2/moz.build
+++ b/gfx/angle/src/libGLESv2/moz.build
@@ -58,17 +58,17 @@ DEFINES['ANGLE_NO_EXCEPTIONS'] = True
# We need these defined to nothing so that we don't get bogus dllimport declspecs
DEFINES['GL_APICALL'] = ""
DEFINES['GL_GLEXT_PROTOTYPES'] = ""
DEFINES['EGLAPI'] = ""
-LOCAL_INCLUDES += [ '../../include', '../../src', '../../src/common/third_party/numerics', '../../src/third_party/khronos' ]
+LOCAL_INCLUDES += [ '../../include', '../../src', '../../src/common/third_party/base', '../../src/third_party/khronos' ]
DEFINES['LIBANGLE_IMPLEMENTATION'] = "1"
DEFINES['ANGLE_ENABLE_HLSL'] = "1"
DEFINES['ANGLE_ENABLE_KEYEDMUTEX'] = "1"
if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
OS_LIBS += [ 'd3d9', 'dxguid' ]
else:
