mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
Bug 1753349 (8/9): build(gfx): update ANGLE vendoring config. r=jgilbert
Differential Revision: https://phabricator.services.mozilla.com/D164254
This commit is contained in:
Erich Gubler
parent
6c6285def1
commit
c49956c1f2
@ -28,66 +28,121 @@ uint64_t IdentifierHashFunc(const char* name, size_t len) {
|
||||
|
||||
static ShCompileOptions ChooseValidatorCompileOptions(
|
||||
const ShBuiltInResources& resources, const mozilla::gl::GLContext* gl) {
|
||||
ShCompileOptions options = SH_VARIABLES | SH_ENFORCE_PACKING_RESTRICTIONS |
|
||||
SH_OBJECT_CODE | SH_INIT_GL_POSITION |
|
||||
SH_INITIALIZE_UNINITIALIZED_LOCALS |
|
||||
SH_INIT_OUTPUT_VARIABLES;
|
||||
ShCompileOptions options = {};
|
||||
options.variables = true;
|
||||
options.enforcePackingRestrictions = true;
|
||||
options.objectCode = true;
|
||||
options.initGLPosition = true;
|
||||
options.initializeUninitializedLocals = true;
|
||||
options.initOutputVariables = true;
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
options |= SH_REMOVE_INVARIANT_AND_CENTROID_FOR_ESSL3;
|
||||
options.removeInvariantAndCentroidForESSL3 = true;
|
||||
#else
|
||||
// We want to do this everywhere, but to do this on Mac, we need
|
||||
// to do it only on Mac OSX > 10.6 as this causes the shader
|
||||
// compiler in 10.6 to crash
|
||||
options |= SH_CLAMP_INDIRECT_ARRAY_BOUNDS;
|
||||
options.clampIndirectArrayBounds = true;
|
||||
#endif
|
||||
|
||||
if (gl->WorkAroundDriverBugs()) {
|
||||
#ifdef XP_MACOSX
|
||||
// Work around https://bugs.webkit.org/show_bug.cgi?id=124684,
|
||||
// https://chromium.googlesource.com/angle/angle/+/5e70cf9d0b1bb
|
||||
options |= SH_UNFOLD_SHORT_CIRCUIT;
|
||||
options.unfoldShortCircuit = true;
|
||||
|
||||
// Work around that Mac drivers handle struct scopes incorrectly.
|
||||
options |= SH_REGENERATE_STRUCT_NAMES;
|
||||
options |= SH_INIT_OUTPUT_VARIABLES;
|
||||
options.regenerateStructNames = true;
|
||||
options.initOutputVariables = true;
|
||||
|
||||
if (gl->Vendor() == gl::GLVendor::Intel) {
|
||||
// Work around that Intel drivers on Mac OSX handle for-loop incorrectly.
|
||||
options |= SH_ADD_AND_TRUE_TO_LOOP_CONDITION;
|
||||
options.addAndTrueToLoopCondition = true;
|
||||
|
||||
options |= SH_REWRITE_TEXELFETCHOFFSET_TO_TEXELFETCH;
|
||||
options.rewriteTexelFetchOffsetToTexelFetch = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (!gl->IsANGLE() && gl->Vendor() == gl::GLVendor::Intel) {
|
||||
// Failures on at least Windows+Intel+OGL on:
|
||||
// conformance/glsl/constructors/glsl-construct-mat2.html
|
||||
options |= SH_SCALARIZE_VEC_AND_MAT_CONSTRUCTOR_ARGS;
|
||||
options.scalarizeVecAndMatConstructorArgs = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (StaticPrefs::webgl_all_angle_options()) {
|
||||
options = -1;
|
||||
|
||||
options ^= SH_INTERMEDIATE_TREE;
|
||||
options ^= SH_LINE_DIRECTIVES;
|
||||
options ^= SH_SOURCE_PATH;
|
||||
|
||||
options ^= SH_LIMIT_EXPRESSION_COMPLEXITY;
|
||||
options ^= SH_LIMIT_CALL_STACK_DEPTH;
|
||||
|
||||
options ^= SH_EXPAND_SELECT_HLSL_INTEGER_POW_EXPRESSIONS;
|
||||
options ^= SH_HLSL_GET_DIMENSIONS_IGNORES_BASE_LEVEL;
|
||||
|
||||
options ^= SH_REMOVE_INVARIANT_AND_CENTROID_FOR_ESSL3;
|
||||
// NOTE: The following attempts exhaustively set every member of
|
||||
// `ShCompileOptions`, following the order of members defined in
|
||||
// `ShaderLang.h`.
|
||||
options.objectCode = true;
|
||||
options.variables = true;
|
||||
options.sourcePath = false;
|
||||
options.intermediateTree = false;
|
||||
options.validateAST = true;
|
||||
options.validateLoopIndexing = true;
|
||||
options.lineDirectives = false;
|
||||
options.removeInvariantAndCentroidForESSL3 = false;
|
||||
options.emulateAbsIntFunction = true;
|
||||
options.enforcePackingRestrictions = true;
|
||||
options.clampIndirectArrayBounds = true;
|
||||
options.limitExpressionComplexity = false;
|
||||
options.limitCallStackDepth = false;
|
||||
options.initGLPosition = true;
|
||||
options.unfoldShortCircuit = true;
|
||||
options.initOutputVariables = true;
|
||||
options.scalarizeVecAndMatConstructorArgs = true;
|
||||
options.regenerateStructNames = true;
|
||||
options.rewriteDoWhileLoops = true;
|
||||
options.expandSelectHLSLIntegerPowExpressions = false;
|
||||
options.flattenPragmaSTDGLInvariantAll = true;
|
||||
options.HLSLGetDimensionsIgnoresBaseLevel = false;
|
||||
options.rewriteTexelFetchOffsetToTexelFetch = true;
|
||||
options.addAndTrueToLoopCondition = true;
|
||||
options.rewriteIntegerUnaryMinusOperator = true;
|
||||
options.emulateIsnanFloatFunction = true;
|
||||
options.useUnusedStandardSharedBlocks = true;
|
||||
options.rewriteFloatUnaryMinusOperator = true;
|
||||
options.emulateAtan2FloatFunction = true;
|
||||
options.initializeUninitializedLocals = true;
|
||||
options.initializeBuiltinsForInstancedMultiview = true;
|
||||
options.selectViewInNvGLSLVertexShader = true;
|
||||
options.clampPointSize = true;
|
||||
options.addAdvancedBlendEquationsEmulation = true;
|
||||
options.dontUseLoopsToInitializeVariables = true;
|
||||
options.skipD3DConstantRegisterZero = true;
|
||||
options.clampFragDepth = true;
|
||||
options.rewriteRepeatedAssignToSwizzled = true;
|
||||
options.emulateGLDrawID = true;
|
||||
options.initSharedVariables = true;
|
||||
options.forceAtomicValueResolution = true;
|
||||
options.emulateGLBaseVertexBaseInstance = true;
|
||||
options.emulateSeamfulCubeMapSampling = true;
|
||||
options.takeVideoTextureAsExternalOES = true;
|
||||
options.addBaseVertexToVertexID = true;
|
||||
options.removeDynamicIndexingOfSwizzledVector = true;
|
||||
options.allowTranslateUniformBlockToStructuredBuffer = true;
|
||||
options.addVulkanYUVLayoutQualifier = true;
|
||||
options.disableARBTextureRectangle = true;
|
||||
options.rewriteRowMajorMatrices = true;
|
||||
options.ignorePrecisionQualifiers = true;
|
||||
options.addVulkanDepthCorrection = true;
|
||||
options.forceShaderPrecisionHighpToMediump = true;
|
||||
options.useSpecializationConstant = true;
|
||||
options.addVulkanXfbEmulationSupportCode = true;
|
||||
options.addVulkanXfbExtensionSupportCode = true;
|
||||
options.initFragmentOutputVariables = true;
|
||||
options.generateSpirvThroughGlslang = true;
|
||||
options.addExplicitBoolCasts = true;
|
||||
options.roundOutputAfterDithering = true;
|
||||
options.precisionSafeDivision = true;
|
||||
options.passHighpToPackUnormSnormBuiltins = true;
|
||||
}
|
||||
|
||||
if (resources.MaxExpressionComplexity > 0) {
|
||||
options |= SH_LIMIT_EXPRESSION_COMPLEXITY;
|
||||
options.limitExpressionComplexity = true;
|
||||
}
|
||||
if (resources.MaxCallStackDepth > 0) {
|
||||
options |= SH_LIMIT_CALL_STACK_DEPTH;
|
||||
options.limitCallStackDepth = true;
|
||||
}
|
||||
|
||||
return options;
|
||||
|
||||
@ -5276,6 +5276,7 @@ skip-if = (os == 'android')
|
||||
[generated/test_2_conformance2__extensions__ovr_multiview2_draw_buffers.html]
|
||||
subsuite = webgl2-core
|
||||
skip-if = (os == 'android')
|
||||
fail-if = (os == 'win' && debug)
|
||||
[generated/test_2_conformance2__extensions__ovr_multiview2_flat_varying.html]
|
||||
subsuite = webgl2-core
|
||||
[generated/test_2_conformance2__extensions__ovr_multiview2_instanced_draw.html]
|
||||
|
||||
@ -788,6 +788,25 @@ skip-if = (os == 'android')
|
||||
skip-if = (os == 'android')
|
||||
[generated/test_2_conformance2__extensions__ovr_multiview2_draw_buffers.html]
|
||||
skip-if = (os == 'android')
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1810021
|
||||
#
|
||||
# Currently getting failures like the following:
|
||||
#
|
||||
# > ```
|
||||
# > the right edge of view 0 of color attachment 1 should be untouched
|
||||
# > the left edge of view 1 of color attachment 1 should be untouched
|
||||
# > the right edge of view 1 of color attachment 1 should be untouched
|
||||
# > the left edge of view 2 of color attachment 1 should be untouched
|
||||
# > the right edge of view 2 of color attachment 1 should be untouched
|
||||
# > the left edge of view 3 of color attachment 1 should be untouched
|
||||
# > the right edge of view 0 of color attachment 2 should be untouched
|
||||
# > the left edge of view 1 of color attachment 2 should be untouched
|
||||
# > the right edge of view 1 of color attachment 2 should be untouched
|
||||
# > the left edge of view 2 of color attachment 2 should be untouched
|
||||
# > the right edge of view 2 of color attachment 2 should be untouched
|
||||
# > the left edge of view 3 of color attachment 2 should be untouched
|
||||
# > ```
|
||||
fail-if = (os == 'win' && debug)
|
||||
[generated/test_2_conformance2__extensions__ovr_multiview2_instanced_draw.html]
|
||||
skip-if = (os == 'android')
|
||||
[generated/test_2_conformance2__renderbuffers__multisampled-renderbuffer-initialization.html]
|
||||
|
||||
@ -1 +1 @@
|
||||
chromium/4515
|
||||
chromium/5359
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
#define ANGLE_COMMIT_HASH "6a5622459d2c"
|
||||
#define ANGLE_COMMIT_HASH "0bf5781fddeb"
|
||||
#define ANGLE_COMMIT_HASH_SIZE 12
|
||||
#define ANGLE_COMMIT_DATE "2022-09-08 17:10:21 -0700"
|
||||
#define ANGLE_COMMIT_POSITION 15728
|
||||
#define ANGLE_COMMIT_DATE "2023-01-19 00:20:06 -0500"
|
||||
#define ANGLE_COMMIT_POSITION 19731
|
||||
#define ANGLE_HAS_BINARY_LOADING
|
||||
|
||||
@ -1,56 +1,26 @@
|
||||
commit 6a5622459d2c1bbd15bf0661083d9f6d901d2c2a
|
||||
Author: Kelsey Gilbert <jgilbert@mozilla.com>
|
||||
Date: Thu Sep 8 17:10:21 2022 -0700
|
||||
commit 0bf5781fddeb50d02b703dd89cc77b2c5f07e334 (HEAD -> refs/heads/firefox-111)
|
||||
Author: Erich Gubler <erichdongubler@gmail.com>
|
||||
Date: Thu Jan 19 00:20:06 2023 -0500
|
||||
|
||||
Import <cmath> in SymbolTable_ESSL_autogen.cpp.
|
||||
build(linux): disable `PoolAlloc` to work around `asan` failures
|
||||
|
||||
Fixes Snap builds of Firefox.
|
||||
We noticed this causing problems in [Firefox CI][failing-ci].
|
||||
|
||||
Change-Id: I8d71d230d5e4a5a042e6afd4e31342da9a085bed
|
||||
[failing-ci]: https://treeherder.mozilla.org/jobs?repo=autoland&author=egubler%40mozilla.com&selectedTaskRun=e6KdZgnNTCOE9weaOnTjVQ.0
|
||||
|
||||
commit 23851a53779dfd3239b4cceb7f93df9ea6efb9c3
|
||||
Author: Jeff Gilbert <jgilbert@mozilla.com>
|
||||
Date: Tue Sep 14 18:11:05 2021 -0700
|
||||
commit ea4d354f6cfc83c31446a855f3fd5603737eae76
|
||||
Author: Erich Gubler <erichdongubler@gmail.com>
|
||||
Date: Wed Nov 16 20:54:23 2022 -0500
|
||||
|
||||
If RoUninitialize iff SUCCEEDED(RoInitialize).
|
||||
fix(windows,pre-c++20): use default ctors for `std::atomic<angle::Mutex*>`
|
||||
|
||||
S_FALSE is success, so `SUCCEEDED(result) || result == S_FALSE` == `SUCCEEDED(result)`.
|
||||
RPC_E_CHANGED_MODE is an Error, so we should not call RoUninitialize in that case.
|
||||
|
||||
Firefox bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1717151
|
||||
|
||||
Change-Id: Ia42fe38967425522964a4f27034e38e9292ab249
|
||||
|
||||
commit c79c27ff20b6a13441807d54ce2b8a487cc57d4a
|
||||
Author: Jeff Gilbert <jgilbert@mozilla.com>
|
||||
Date: Mon Jul 19 16:46:50 2021 -0700
|
||||
|
||||
Define ANGLE_IS_64_BIT_CPU in common/platform.h.
|
||||
|
||||
This is more reliable and reduces reliance on build flags.
|
||||
Vendoring into Firefox, it's not trivial to replicate build flags,
|
||||
but C++-native checks always work.
|
||||
|
||||
Bug: angleproject:6186
|
||||
Change-Id: Idafd4ef1954efbfa79eae86cddfaa8f2e3992296
|
||||
|
||||
commit 33ffc12336370c17ba8da02c8e1f0eeb44951a7b
|
||||
Author: Jeff Gilbert <jgilbert@mozilla.com>
|
||||
Date: Thu Jul 29 10:40:38 2021 -0700
|
||||
|
||||
Always include mac-only sources.
|
||||
|
||||
Fixes build issues on mac until we can take b8d6f8aa93 instead.
|
||||
|
||||
Change-Id: I4dafc86cdb167d23e8dd419ded9d0edfb3f76f3a
|
||||
|
||||
commit 631763e48d2906e680112c79dd161522f553e0cc
|
||||
commit 9bcfaed62b60e210004217fd5e79c25f3e2b3760
|
||||
Author: Jeff Gilbert <jdashg@gmail.com>
|
||||
Date: Thu Jul 15 15:56:45 2021 -0700
|
||||
|
||||
Add missing header to build config.
|
||||
|
||||
commit 5cf86083d48f3bae5a169d51e56b538afda56367
|
||||
commit 16baec7195df362b9d615ccb7e5d51673501e10e
|
||||
Author: Jeff Gilbert <jdashg@gmail.com>
|
||||
Date: Thu Feb 11 17:34:00 2021 -0800
|
||||
|
||||
@ -61,29 +31,7 @@ Date: Thu Feb 11 17:34:00 2021 -0800
|
||||
match enough to hit the CopySubResource path.
|
||||
Firefox bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1692355
|
||||
|
||||
commit 400476a0b2e1ba6dfa8413375e20c15c2ec9188a
|
||||
Author: Jeff Gilbert <jdashg@gmail.com>
|
||||
Date: Wed Feb 3 18:50:38 2021 -0800
|
||||
|
||||
Add ANGLE_TRANSLATOR_ESSL_ONLY instead of using build system logic to choose.
|
||||
|
||||
Build system logic is really hard to handle when vendoring into Gecko for Firefox.
|
||||
|
||||
commit 406e1ed92a6fc4180257e65ec88398342a7015e7
|
||||
Author: Jeff Gilbert <jdashg@gmail.com>
|
||||
Date: Mon Feb 1 17:35:56 2021 -0800
|
||||
|
||||
Build fixes needed by Gecko.
|
||||
|
||||
commit d408f3f0f8d74427eef8a9200d29687629525502
|
||||
Author: Jeff Muizelaar <jrmuizel@gmail.com>
|
||||
Date: Mon Nov 9 17:09:12 2020 -0500
|
||||
|
||||
Bug 1620075. Add a feature flag to allow ES3 on 10.0 devices. (#26)
|
||||
|
||||
This lets us run WebRender on devices that only support D3D 10.0
|
||||
|
||||
commit 53f3a3515e4bcf626042cfe0bf445cca4e728cf1
|
||||
commit 43e9d9a7c95b509869a774fab62bf42d6d15b745
|
||||
Author: Jeff Muizelaar <jrmuizel@gmail.com>
|
||||
Date: Wed May 6 14:04:42 2020 -0400
|
||||
|
||||
@ -97,7 +45,13 @@ Date: Wed May 6 14:04:42 2020 -0400
|
||||
If we detect that this is going to happen we fall back to the manual
|
||||
draw call path. This lets us use ClearView most of the time still.
|
||||
|
||||
commit 988c40cee12de022c9e7aa63d3d2de86d1310e1f
|
||||
commit b16ebaa05424354c06c2ccdccc36df2c7c1b191e
|
||||
Author: Erich Gubler <erichdongubler@gmail.com>
|
||||
Date: Wed Nov 9 21:12:44 2022 -0500
|
||||
|
||||
Fix broken build from `-Wexit-time-destructors` on Windows x64
|
||||
|
||||
commit 4c3a473aec4e09ffacd0466817cb851529087767
|
||||
Author: Dzmitry Malyshau <dmalyshau@mozilla.com>
|
||||
Date: Thu Dec 5 13:02:14 2019 -0500
|
||||
|
||||
@ -107,30 +61,21 @@ Date: Thu Dec 5 13:02:14 2019 -0500
|
||||
|
||||
Original reports were related to WebRender vertex texture updates that are RGBA32F and RGBA32U formats. Limiting the workaround to these formats would allow the affected platforms to upload regular texture data faster without stalls.
|
||||
|
||||
commit 3a1d51f5784f13373f60e4138c80dcbebdab5524
|
||||
Author: Miko Mynttinen <mikokm@gmail.com>
|
||||
Date: Tue Sep 3 18:54:54 2019 +0200
|
||||
Co-authored-by: Erich Gubler <erichdongubler@gmail.com>
|
||||
|
||||
Disable debug layers
|
||||
|
||||
Cherries picked
|
||||
Above: cherries picked
|
||||
================================================================================
|
||||
Merge base from: origin/chromium/4515
|
||||
Below: merge base from: origin/chromium/5359
|
||||
|
||||
commit 018f85dea11fd5e41725750c6958695a6b8e8409
|
||||
Author: Jamie Madill <jmadill@chromium.org>
|
||||
Date: Fri Sep 3 09:34:10 2021 -0400
|
||||
commit ceec659ac60b0c8ee9d9c602ca1a878ec1d3a88f (refs/remotes/origin/chromium/5359, refs/heads/chromium/5359)
|
||||
Author: Shahbaz Youssefi <syoussefi@chromium.org>
|
||||
Date: Mon Oct 31 10:29:45 2022 -0400
|
||||
|
||||
WebGL: Make unsuccessful links fail subsequent draw calls.
|
||||
M108: Vulkan: Disable logicOp dynamic state on Intel/Mesa
|
||||
|
||||
This protects against incomplete state updates during a failed
|
||||
link call that can interfere with draw calls.
|
||||
Hits a stack overflow inside the driver.
|
||||
|
||||
Bug: angleproject:6358
|
||||
Bug: chromium:1241123
|
||||
Change-Id: Ie892654c3a58c69d6e35ba3c41758ab6269d8193
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3140496
|
||||
Reviewed-by: Geoff Lang <geofflang@chromium.org>
|
||||
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3152556
|
||||
Reviewed-by: Jamie Madill <jmadill@chromium.org>
|
||||
Bug: chromium:1379201
|
||||
Change-Id: I790d7ef0333ba17eedbe91e4fc9c3a2b94563bff
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4004440
|
||||
Reviewed-by: Yuxin Hu <yuxinhu@google.com>
|
||||
|
||||
@ -15,8 +15,8 @@ origin:
|
||||
# release, and upstream repo locations refer to the third party upstream,
|
||||
# Angle is vendored from a mozilla git repository that pulls from
|
||||
# upstream and mainntains local patches there.
|
||||
release: commit 018f85dea11fd5e41725750c6958695a6b8e8409 Thu Sep 9 20:40:49 2021 +0000
|
||||
revision: 018f85dea11fd5e41725750c6958695a6b8e8409
|
||||
release: commit ceec659ac60b0c8ee9d9c602ca1a878ec1d3a88f Fri Nov 4 13:35:51 2022 +0000
|
||||
revision: ceec659ac60b0c8ee9d9c602ca1a878ec1d3a88f
|
||||
|
||||
license: BSD-3-Clause
|
||||
|
||||
@ -26,7 +26,7 @@ updatebot:
|
||||
tasks:
|
||||
- type: commit-alert
|
||||
enabled: True
|
||||
branch: chromium/4515
|
||||
branch: chromium/5359
|
||||
needinfo: ["jgilbert@mozilla.com"]
|
||||
|
||||
vendoring:
|
||||
|
||||
@ -2,13 +2,16 @@
|
||||
|
||||
include("../../moz.build.common")
|
||||
|
||||
DEFINES["ANGLE_DISABLE_POOL_ALLOC"] = True
|
||||
DEFINES["ANGLE_ENABLE_SHARE_CONTEXT_LOCK"] = "1"
|
||||
# DEFINES["ANGLE_IS_WIN"] = True
|
||||
DEFINES["ANGLE_VMA_VERSION"] = "2003000"
|
||||
# DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
|
||||
DEFINES["CR_CLANG_REVISION"] = '"llvmorg-13-init-9302-g897d7bce-1"'
|
||||
DEFINES["CR_CLANG_REVISION"] = '"llvmorg-16-init-6578-g0d30e92f-2"'
|
||||
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
|
||||
# DEFINES["NDEBUG"] = True
|
||||
DEFINES["NOMINMAX"] = True
|
||||
# DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_VB"
|
||||
# DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_FE"
|
||||
# DEFINES["NVALGRIND"] = True
|
||||
# DEFINES["PSAPI_VERSION"] = "2"
|
||||
DEFINES["UNICODE"] = True
|
||||
@ -18,6 +21,7 @@ DEFINES["UNICODE"] = True
|
||||
# DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
|
||||
DEFINES["WINVER"] = "0x0A00"
|
||||
DEFINES["_ATL_NO_OPENGL"] = True
|
||||
DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
|
||||
DEFINES["_CRT_RAND_S"] = True
|
||||
DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
|
||||
DEFINES["_HAS_EXCEPTIONS"] = "0"
|
||||
@ -27,11 +31,11 @@ DEFINES["_SECURE_ATL"] = True
|
||||
DEFINES["_UNICODE"] = True
|
||||
# DEFINES["_WIN32_WINNT"] = "0x0A00"
|
||||
# DEFINES["_WINDOWS"] = True
|
||||
DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
|
||||
# DEFINES["__STD_C"] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
"../../checkout/include/",
|
||||
"../../checkout/out/gen/angle/",
|
||||
"../../checkout/src/",
|
||||
"../../checkout/src/common/third_party/base/",
|
||||
]
|
||||
@ -43,12 +47,14 @@ LOCAL_INCLUDES += [
|
||||
# "-fcolor-diagnostics",
|
||||
# "-fcomplete-member-pointers",
|
||||
# "-fcrash-diagnostics-dir=../tools/clang/crashreports",
|
||||
# "-fdebug-compilation-dir",
|
||||
# "-ffile-compilation-dir=.",
|
||||
# "-ffile-reproducible",
|
||||
# "-fmerge-all-constants",
|
||||
# "-fmsc-version=1916",
|
||||
# "-fno-delete-null-pointer-checks",
|
||||
# "-fno-ident",
|
||||
# "-ftrivial-auto-var-init=pattern",
|
||||
# "-fuse-ctor-homing",
|
||||
# "-gcodeview-ghash",
|
||||
# "-instcombine-lower-dbg-declare=0",
|
||||
# "-m64",
|
||||
@ -57,6 +63,7 @@ LOCAL_INCLUDES += [
|
||||
# "-no-canonical-prefixes",
|
||||
# "-Wbad-function-cast",
|
||||
# "-Wconditional-uninitialized",
|
||||
# "-Wenum-compare-conditional",
|
||||
# "-Wexit-time-destructors",
|
||||
# "-Wextra-semi",
|
||||
# "-Wextra-semi-stmt",
|
||||
@ -65,22 +72,17 @@ LOCAL_INCLUDES += [
|
||||
# "-Wheader-hygiene",
|
||||
# "-Wimplicit-fallthrough",
|
||||
# "-Winconsistent-missing-destructor-override",
|
||||
# "-Wmax-tokens",
|
||||
# "-Wloop-analysis",
|
||||
# "-Wmissing-field-initializers",
|
||||
# "-Wnewline-eof",
|
||||
# "-Wno-builtin-assume-aligned-alignment",
|
||||
# "-Wno-bitfield-constant-conversion",
|
||||
# "-Wno-builtin-macro-redefined",
|
||||
# "-Wno-c++11-narrowing",
|
||||
# "-Wno-deprecated-copy",
|
||||
# "-Wno-final-dtor-non-final-class",
|
||||
# "-Wno-deprecated-builtins",
|
||||
# "-Wno-ignored-pragma-optimize",
|
||||
# "-Wno-implicit-int-float-conversion",
|
||||
# "-Wno-missing-field-initializers",
|
||||
# "-Wno-non-c-typedef-for-linkage",
|
||||
# "-Wno-nonportable-include-path",
|
||||
# "-Wno-psabi",
|
||||
# "-Wno-trigraphs",
|
||||
# "-Wno-undefined-var-template",
|
||||
# "-Wno-unneeded-internal-declaration",
|
||||
# "-Wno-unused-parameter",
|
||||
# "-Wnon-virtual-dtor",
|
||||
@ -88,6 +90,7 @@ LOCAL_INCLUDES += [
|
||||
# "-Wrange-loop-analysis",
|
||||
# "-Wredundant-parens",
|
||||
# "-Wreturn-std-move",
|
||||
# "-Wshadow",
|
||||
# "-Wshadow-field",
|
||||
# "-Wshorten-64-to-32",
|
||||
# "-Wstrict-prototypes",
|
||||
@ -99,16 +102,16 @@ LOCAL_INCLUDES += [
|
||||
# "-Wthread-safety",
|
||||
# "-Wundefined-reinterpret-cast",
|
||||
# "-Wunneeded-internal-declaration",
|
||||
# "-Wunreachable-code",
|
||||
# "-Wweak-template-vtables",
|
||||
# "-Wunreachable-code-aggressive",
|
||||
# "-Wunused-but-set-variable",
|
||||
# "-Xclang",
|
||||
# ".",
|
||||
# "/bigobj",
|
||||
# "/Brepro",
|
||||
# "/clang:-ffp-contract=off",
|
||||
# "/D__WRL_ENABLE_FUNCTION_STATICS__",
|
||||
# "/FS",
|
||||
# "/GR-",
|
||||
# "/guard:cf,nochecks",
|
||||
# "/guard:cf",
|
||||
# "/Gw",
|
||||
# "/Gy",
|
||||
# "/MT",
|
||||
@ -116,49 +119,10 @@ LOCAL_INCLUDES += [
|
||||
# "/Ob2",
|
||||
# "/Oi",
|
||||
# "/Oy-",
|
||||
# "/std:c++17",
|
||||
# "/TP",
|
||||
# "/utf-8",
|
||||
# "/W4",
|
||||
# "/wd4091",
|
||||
# "/wd4100",
|
||||
# "/wd4121",
|
||||
# "/wd4127",
|
||||
# "/wd4200",
|
||||
# "/wd4201",
|
||||
# "/wd4204",
|
||||
# "/wd4221",
|
||||
# "/wd4244",
|
||||
# "/wd4245",
|
||||
# "/wd4251",
|
||||
# "/wd4267",
|
||||
# "/wd4275",
|
||||
# "/wd4305",
|
||||
# "/wd4312",
|
||||
# "/wd4324",
|
||||
# "/wd4351",
|
||||
# "/wd4355",
|
||||
# "/wd4389",
|
||||
# "/wd4456",
|
||||
# "/wd4457",
|
||||
# "/wd4458",
|
||||
# "/wd4459",
|
||||
# "/wd4503",
|
||||
# "/wd4505",
|
||||
# "/wd4510",
|
||||
# "/wd4512",
|
||||
# "/wd4577",
|
||||
# "/wd4589",
|
||||
# "/wd4610",
|
||||
# "/wd4611",
|
||||
# "/wd4661",
|
||||
# "/wd4701",
|
||||
# "/wd4702",
|
||||
# "/wd4703",
|
||||
# "/wd4706",
|
||||
# "/wd4715",
|
||||
# "/wd4838",
|
||||
# "/wd4995",
|
||||
# "/wd4996",
|
||||
# "/we4244",
|
||||
# "/we4312",
|
||||
# "/we4456",
|
||||
@ -234,7 +198,7 @@ if CONFIG["OS_ARCH"] not in ("Darwin", "WINNT"):
|
||||
# "/pdbaltpath:%_PDB%",
|
||||
# "/PDBSourcePath:C:/dev/angle/out",
|
||||
# "/PROFILE",
|
||||
# "/TIMESTAMP:1619931600",
|
||||
# "/TIMESTAMP:1664686800",
|
||||
# "/WX",
|
||||
# ]
|
||||
|
||||
|
||||
@ -2,17 +2,23 @@
|
||||
|
||||
include("../../moz.build.common")
|
||||
|
||||
DEFINES["ANGLE_DISABLE_POOL_ALLOC"] = True
|
||||
DEFINES["ANGLE_ENABLE_D3D11"] = True
|
||||
DEFINES["ANGLE_ENABLE_D3D11_COMPOSITOR_NATIVE_WINDOW"] = True
|
||||
DEFINES["ANGLE_ENABLE_D3D9"] = True
|
||||
# DEFINES["ANGLE_HAS_VULKAN_SYSTEM_INFO"] = True
|
||||
DEFINES["ANGLE_ENABLE_SHARE_CONTEXT_LOCK"] = "1"
|
||||
# DEFINES["ANGLE_IS_WIN"] = True
|
||||
DEFINES["ANGLE_SHARED_LIBVULKAN"] = "1"
|
||||
DEFINES["ANGLE_USE_CUSTOM_LIBVULKAN"] = True
|
||||
DEFINES["ANGLE_VK_LAYERS_DIR"] = '"angledata"'
|
||||
DEFINES["ANGLE_VK_MOCK_ICD_JSON"] = '"angledata/VkICD_mock_icd.json"'
|
||||
DEFINES["ANGLE_VMA_VERSION"] = "2003000"
|
||||
# DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
|
||||
DEFINES["CR_CLANG_REVISION"] = '"llvmorg-13-init-9302-g897d7bce-1"'
|
||||
DEFINES["CR_CLANG_REVISION"] = '"llvmorg-16-init-6578-g0d30e92f-2"'
|
||||
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
|
||||
# DEFINES["NDEBUG"] = True
|
||||
DEFINES["NOMINMAX"] = True
|
||||
# DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_VB"
|
||||
# DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_FE"
|
||||
# DEFINES["NVALGRIND"] = True
|
||||
# DEFINES["PSAPI_VERSION"] = "2"
|
||||
DEFINES["UNICODE"] = True
|
||||
@ -23,6 +29,7 @@ DEFINES["UNICODE"] = True
|
||||
# DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
|
||||
DEFINES["WINVER"] = "0x0A00"
|
||||
DEFINES["_ATL_NO_OPENGL"] = True
|
||||
DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
|
||||
DEFINES["_CRT_RAND_S"] = True
|
||||
DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
|
||||
DEFINES["_HAS_EXCEPTIONS"] = "0"
|
||||
@ -32,15 +39,16 @@ DEFINES["_SECURE_ATL"] = True
|
||||
DEFINES["_UNICODE"] = True
|
||||
# DEFINES["_WIN32_WINNT"] = "0x0A00"
|
||||
# DEFINES["_WINDOWS"] = True
|
||||
DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
|
||||
# DEFINES["__STD_C"] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
"../../checkout/",
|
||||
"../../checkout/include/",
|
||||
"../../checkout/out/gen/",
|
||||
"../../checkout/out/gen/angle/",
|
||||
"../../checkout/src/",
|
||||
"../../checkout/src/common/third_party/base/",
|
||||
"../../checkout/src/third_party/volk/",
|
||||
"../../checkout/third_party/vulkan-deps/vulkan-headers/src/include/",
|
||||
]
|
||||
|
||||
@ -52,12 +60,14 @@ LOCAL_INCLUDES += [
|
||||
# "-fcolor-diagnostics",
|
||||
# "-fcomplete-member-pointers",
|
||||
# "-fcrash-diagnostics-dir=../tools/clang/crashreports",
|
||||
# "-fdebug-compilation-dir",
|
||||
# "-ffile-compilation-dir=.",
|
||||
# "-ffile-reproducible",
|
||||
# "-fmerge-all-constants",
|
||||
# "-fmsc-version=1916",
|
||||
# "-fno-delete-null-pointer-checks",
|
||||
# "-fno-ident",
|
||||
# "-ftrivial-auto-var-init=pattern",
|
||||
# "-fuse-ctor-homing",
|
||||
# "-gcodeview-ghash",
|
||||
# "-instcombine-lower-dbg-declare=0",
|
||||
# "-m64",
|
||||
@ -67,6 +77,7 @@ LOCAL_INCLUDES += [
|
||||
# "-plugin-arg-find-bad-constructs",
|
||||
# "-Wbad-function-cast",
|
||||
# "-Wconditional-uninitialized",
|
||||
# "-Wenum-compare-conditional",
|
||||
# "-Wexit-time-destructors",
|
||||
# "-Wextra-semi",
|
||||
# "-Wextra-semi-stmt",
|
||||
@ -75,22 +86,17 @@ LOCAL_INCLUDES += [
|
||||
# "-Wheader-hygiene",
|
||||
# "-Wimplicit-fallthrough",
|
||||
# "-Winconsistent-missing-destructor-override",
|
||||
# "-Wmax-tokens",
|
||||
# "-Wloop-analysis",
|
||||
# "-Wmissing-field-initializers",
|
||||
# "-Wnewline-eof",
|
||||
# "-Wno-builtin-assume-aligned-alignment",
|
||||
# "-Wno-bitfield-constant-conversion",
|
||||
# "-Wno-builtin-macro-redefined",
|
||||
# "-Wno-c++11-narrowing",
|
||||
# "-Wno-deprecated-copy",
|
||||
# "-Wno-final-dtor-non-final-class",
|
||||
# "-Wno-deprecated-builtins",
|
||||
# "-Wno-ignored-pragma-optimize",
|
||||
# "-Wno-implicit-int-float-conversion",
|
||||
# "-Wno-missing-field-initializers",
|
||||
# "-Wno-non-c-typedef-for-linkage",
|
||||
# "-Wno-nonportable-include-path",
|
||||
# "-Wno-psabi",
|
||||
# "-Wno-trigraphs",
|
||||
# "-Wno-undefined-var-template",
|
||||
# "-Wno-unneeded-internal-declaration",
|
||||
# "-Wno-unused-parameter",
|
||||
# "-Wnon-virtual-dtor",
|
||||
@ -98,6 +104,7 @@ LOCAL_INCLUDES += [
|
||||
# "-Wrange-loop-analysis",
|
||||
# "-Wredundant-parens",
|
||||
# "-Wreturn-std-move",
|
||||
# "-Wshadow",
|
||||
# "-Wshadow-field",
|
||||
# "-Wshorten-64-to-32",
|
||||
# "-Wstrict-prototypes",
|
||||
@ -109,16 +116,16 @@ LOCAL_INCLUDES += [
|
||||
# "-Wthread-safety",
|
||||
# "-Wundefined-reinterpret-cast",
|
||||
# "-Wunneeded-internal-declaration",
|
||||
# "-Wunreachable-code",
|
||||
# "-Wweak-template-vtables",
|
||||
# "-Wunreachable-code-aggressive",
|
||||
# "-Wunused-but-set-variable",
|
||||
# "-Xclang",
|
||||
# ".",
|
||||
# "/bigobj",
|
||||
# "/Brepro",
|
||||
# "/clang:-ffp-contract=off",
|
||||
# "/D__WRL_ENABLE_FUNCTION_STATICS__",
|
||||
# "/FS",
|
||||
# "/GR-",
|
||||
# "/guard:cf,nochecks",
|
||||
# "/guard:cf",
|
||||
# "/Gw",
|
||||
# "/Gy",
|
||||
# "/MT",
|
||||
@ -126,49 +133,10 @@ LOCAL_INCLUDES += [
|
||||
# "/Ob2",
|
||||
# "/Oi",
|
||||
# "/Oy-",
|
||||
# "/std:c++17",
|
||||
# "/TP",
|
||||
# "/utf-8",
|
||||
# "/W4",
|
||||
# "/wd4091",
|
||||
# "/wd4100",
|
||||
# "/wd4121",
|
||||
# "/wd4127",
|
||||
# "/wd4200",
|
||||
# "/wd4201",
|
||||
# "/wd4204",
|
||||
# "/wd4221",
|
||||
# "/wd4244",
|
||||
# "/wd4245",
|
||||
# "/wd4251",
|
||||
# "/wd4267",
|
||||
# "/wd4275",
|
||||
# "/wd4305",
|
||||
# "/wd4312",
|
||||
# "/wd4324",
|
||||
# "/wd4351",
|
||||
# "/wd4355",
|
||||
# "/wd4389",
|
||||
# "/wd4456",
|
||||
# "/wd4457",
|
||||
# "/wd4458",
|
||||
# "/wd4459",
|
||||
# "/wd4503",
|
||||
# "/wd4505",
|
||||
# "/wd4510",
|
||||
# "/wd4512",
|
||||
# "/wd4577",
|
||||
# "/wd4589",
|
||||
# "/wd4610",
|
||||
# "/wd4611",
|
||||
# "/wd4661",
|
||||
# "/wd4701",
|
||||
# "/wd4702",
|
||||
# "/wd4703",
|
||||
# "/wd4706",
|
||||
# "/wd4715",
|
||||
# "/wd4838",
|
||||
# "/wd4995",
|
||||
# "/wd4996",
|
||||
# "/we4244",
|
||||
# "/we4312",
|
||||
# "/we4456",
|
||||
@ -181,13 +149,16 @@ LOCAL_INCLUDES += [
|
||||
# "/Zc:inline",
|
||||
# "/Zc:sizedDealloc-",
|
||||
# "/Zc:twoPhase",
|
||||
# "checked-ptr-as-trivial-member",
|
||||
# "find-bad-constructs",
|
||||
# "raw-ref-template-as-trivial-member",
|
||||
# ]
|
||||
|
||||
SOURCES += [
|
||||
"../../checkout/src/common/vulkan/libvulkan_loader.cpp",
|
||||
"../../checkout/src/common/vulkan/vulkan_icd.cpp",
|
||||
"../../checkout/src/gpu_info_util/SystemInfo.cpp",
|
||||
"../../checkout/src/gpu_info_util/SystemInfo_vulkan.cpp",
|
||||
"../../checkout/src/third_party/volk/volk.c",
|
||||
]
|
||||
|
||||
if CONFIG["OS_ARCH"] == "WINNT":
|
||||
@ -223,7 +194,7 @@ OS_LIBS += [
|
||||
# "/pdbaltpath:%_PDB%",
|
||||
# "/PDBSourcePath:C:/dev/angle/out",
|
||||
# "/PROFILE",
|
||||
# "/TIMESTAMP:1619931600",
|
||||
# "/TIMESTAMP:1664686800",
|
||||
# "/WX",
|
||||
# ]
|
||||
|
||||
|
||||
@ -2,13 +2,16 @@
|
||||
|
||||
include("../../moz.build.common")
|
||||
|
||||
DEFINES["ANGLE_DISABLE_POOL_ALLOC"] = True
|
||||
DEFINES["ANGLE_ENABLE_SHARE_CONTEXT_LOCK"] = "1"
|
||||
# DEFINES["ANGLE_IS_WIN"] = True
|
||||
DEFINES["ANGLE_VMA_VERSION"] = "2003000"
|
||||
# DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
|
||||
DEFINES["CR_CLANG_REVISION"] = '"llvmorg-13-init-9302-g897d7bce-1"'
|
||||
DEFINES["CR_CLANG_REVISION"] = '"llvmorg-16-init-6578-g0d30e92f-2"'
|
||||
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
|
||||
# DEFINES["NDEBUG"] = True
|
||||
DEFINES["NOMINMAX"] = True
|
||||
# DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_VB"
|
||||
# DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_FE"
|
||||
# DEFINES["NVALGRIND"] = True
|
||||
# DEFINES["PSAPI_VERSION"] = "2"
|
||||
DEFINES["UNICODE"] = True
|
||||
@ -18,6 +21,7 @@ DEFINES["UNICODE"] = True
|
||||
# DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
|
||||
DEFINES["WINVER"] = "0x0A00"
|
||||
DEFINES["_ATL_NO_OPENGL"] = True
|
||||
DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
|
||||
DEFINES["_CRT_RAND_S"] = True
|
||||
DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
|
||||
DEFINES["_HAS_EXCEPTIONS"] = "0"
|
||||
@ -27,11 +31,11 @@ DEFINES["_SECURE_ATL"] = True
|
||||
DEFINES["_UNICODE"] = True
|
||||
# DEFINES["_WIN32_WINNT"] = "0x0A00"
|
||||
# DEFINES["_WINDOWS"] = True
|
||||
DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
|
||||
# DEFINES["__STD_C"] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
"../../checkout/include/",
|
||||
"../../checkout/out/gen/angle/",
|
||||
"../../checkout/src/",
|
||||
"../../checkout/src/common/third_party/base/",
|
||||
]
|
||||
@ -43,12 +47,14 @@ LOCAL_INCLUDES += [
|
||||
# "-fcolor-diagnostics",
|
||||
# "-fcomplete-member-pointers",
|
||||
# "-fcrash-diagnostics-dir=../tools/clang/crashreports",
|
||||
# "-fdebug-compilation-dir",
|
||||
# "-ffile-compilation-dir=.",
|
||||
# "-ffile-reproducible",
|
||||
# "-fmerge-all-constants",
|
||||
# "-fmsc-version=1916",
|
||||
# "-fno-delete-null-pointer-checks",
|
||||
# "-fno-ident",
|
||||
# "-ftrivial-auto-var-init=pattern",
|
||||
# "-fuse-ctor-homing",
|
||||
# "-gcodeview-ghash",
|
||||
# "-instcombine-lower-dbg-declare=0",
|
||||
# "-m64",
|
||||
@ -57,6 +63,7 @@ LOCAL_INCLUDES += [
|
||||
# "-no-canonical-prefixes",
|
||||
# "-Wbad-function-cast",
|
||||
# "-Wconditional-uninitialized",
|
||||
# "-Wenum-compare-conditional",
|
||||
# "-Wexit-time-destructors",
|
||||
# "-Wextra-semi",
|
||||
# "-Wextra-semi-stmt",
|
||||
@ -65,22 +72,17 @@ LOCAL_INCLUDES += [
|
||||
# "-Wheader-hygiene",
|
||||
# "-Wimplicit-fallthrough",
|
||||
# "-Winconsistent-missing-destructor-override",
|
||||
# "-Wmax-tokens",
|
||||
# "-Wloop-analysis",
|
||||
# "-Wmissing-field-initializers",
|
||||
# "-Wnewline-eof",
|
||||
# "-Wno-builtin-assume-aligned-alignment",
|
||||
# "-Wno-bitfield-constant-conversion",
|
||||
# "-Wno-builtin-macro-redefined",
|
||||
# "-Wno-c++11-narrowing",
|
||||
# "-Wno-deprecated-copy",
|
||||
# "-Wno-final-dtor-non-final-class",
|
||||
# "-Wno-deprecated-builtins",
|
||||
# "-Wno-ignored-pragma-optimize",
|
||||
# "-Wno-implicit-int-float-conversion",
|
||||
# "-Wno-missing-field-initializers",
|
||||
# "-Wno-non-c-typedef-for-linkage",
|
||||
# "-Wno-nonportable-include-path",
|
||||
# "-Wno-psabi",
|
||||
# "-Wno-trigraphs",
|
||||
# "-Wno-undefined-var-template",
|
||||
# "-Wno-unneeded-internal-declaration",
|
||||
# "-Wno-unused-parameter",
|
||||
# "-Wnon-virtual-dtor",
|
||||
@ -88,6 +90,7 @@ LOCAL_INCLUDES += [
|
||||
# "-Wrange-loop-analysis",
|
||||
# "-Wredundant-parens",
|
||||
# "-Wreturn-std-move",
|
||||
# "-Wshadow",
|
||||
# "-Wshadow-field",
|
||||
# "-Wshorten-64-to-32",
|
||||
# "-Wstrict-prototypes",
|
||||
@ -99,16 +102,16 @@ LOCAL_INCLUDES += [
|
||||
# "-Wthread-safety",
|
||||
# "-Wundefined-reinterpret-cast",
|
||||
# "-Wunneeded-internal-declaration",
|
||||
# "-Wunreachable-code",
|
||||
# "-Wweak-template-vtables",
|
||||
# "-Wunreachable-code-aggressive",
|
||||
# "-Wunused-but-set-variable",
|
||||
# "-Xclang",
|
||||
# ".",
|
||||
# "/bigobj",
|
||||
# "/Brepro",
|
||||
# "/clang:-ffp-contract=off",
|
||||
# "/D__WRL_ENABLE_FUNCTION_STATICS__",
|
||||
# "/FS",
|
||||
# "/GR-",
|
||||
# "/guard:cf,nochecks",
|
||||
# "/guard:cf",
|
||||
# "/Gw",
|
||||
# "/Gy",
|
||||
# "/MT",
|
||||
@ -116,49 +119,10 @@ LOCAL_INCLUDES += [
|
||||
# "/Ob2",
|
||||
# "/Oi",
|
||||
# "/Oy-",
|
||||
# "/std:c++17",
|
||||
# "/TP",
|
||||
# "/utf-8",
|
||||
# "/W4",
|
||||
# "/wd4091",
|
||||
# "/wd4100",
|
||||
# "/wd4121",
|
||||
# "/wd4127",
|
||||
# "/wd4200",
|
||||
# "/wd4201",
|
||||
# "/wd4204",
|
||||
# "/wd4221",
|
||||
# "/wd4244",
|
||||
# "/wd4245",
|
||||
# "/wd4251",
|
||||
# "/wd4267",
|
||||
# "/wd4275",
|
||||
# "/wd4305",
|
||||
# "/wd4312",
|
||||
# "/wd4324",
|
||||
# "/wd4351",
|
||||
# "/wd4355",
|
||||
# "/wd4389",
|
||||
# "/wd4456",
|
||||
# "/wd4457",
|
||||
# "/wd4458",
|
||||
# "/wd4459",
|
||||
# "/wd4503",
|
||||
# "/wd4505",
|
||||
# "/wd4510",
|
||||
# "/wd4512",
|
||||
# "/wd4577",
|
||||
# "/wd4589",
|
||||
# "/wd4610",
|
||||
# "/wd4611",
|
||||
# "/wd4661",
|
||||
# "/wd4701",
|
||||
# "/wd4702",
|
||||
# "/wd4703",
|
||||
# "/wd4706",
|
||||
# "/wd4715",
|
||||
# "/wd4838",
|
||||
# "/wd4995",
|
||||
# "/wd4996",
|
||||
# "/we4244",
|
||||
# "/we4312",
|
||||
# "/we4456",
|
||||
@ -177,7 +141,9 @@ SOURCES += [
|
||||
"../../checkout/src/image_util/copyimage.cpp",
|
||||
"../../checkout/src/image_util/imageformats.cpp",
|
||||
"../../checkout/src/image_util/loadimage.cpp",
|
||||
"../../checkout/src/image_util/loadimage_astc.cpp",
|
||||
"../../checkout/src/image_util/loadimage_etc.cpp",
|
||||
"../../checkout/src/image_util/loadimage_paletted.cpp",
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
@ -202,7 +168,7 @@ DIRS += [
|
||||
# "/pdbaltpath:%_PDB%",
|
||||
# "/PDBSourcePath:C:/dev/angle/out",
|
||||
# "/PROFILE",
|
||||
# "/TIMESTAMP:1619931600",
|
||||
# "/TIMESTAMP:1664686800",
|
||||
# "/WX",
|
||||
# ]
|
||||
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
include("../../moz.build.common")
|
||||
|
||||
# DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
|
||||
DEFINES["CR_CLANG_REVISION"] = '"llvmorg-13-init-9302-g897d7bce-1"'
|
||||
DEFINES["CR_CLANG_REVISION"] = '"llvmorg-16-init-6578-g0d30e92f-2"'
|
||||
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
|
||||
# DEFINES["NDEBUG"] = True
|
||||
DEFINES["NOMINMAX"] = True
|
||||
# DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_VB"
|
||||
# DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_FE"
|
||||
# DEFINES["NVALGRIND"] = True
|
||||
# DEFINES["PSAPI_VERSION"] = "2"
|
||||
DEFINES["UNICODE"] = True
|
||||
@ -17,6 +17,7 @@ DEFINES["UNICODE"] = True
|
||||
# DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
|
||||
DEFINES["WINVER"] = "0x0A00"
|
||||
DEFINES["_ATL_NO_OPENGL"] = True
|
||||
DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
|
||||
DEFINES["_CRT_RAND_S"] = True
|
||||
DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
|
||||
DEFINES["_HAS_EXCEPTIONS"] = "0"
|
||||
@ -26,6 +27,7 @@ DEFINES["_SECURE_ATL"] = True
|
||||
DEFINES["_UNICODE"] = True
|
||||
# DEFINES["_WIN32_WINNT"] = "0x0A00"
|
||||
# DEFINES["_WINDOWS"] = True
|
||||
DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
|
||||
# DEFINES["__STD_C"] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
@ -42,12 +44,14 @@ LOCAL_INCLUDES += [
|
||||
# "-fcolor-diagnostics",
|
||||
# "-fcomplete-member-pointers",
|
||||
# "-fcrash-diagnostics-dir=../tools/clang/crashreports",
|
||||
# "-fdebug-compilation-dir",
|
||||
# "-ffile-compilation-dir=.",
|
||||
# "-ffile-reproducible",
|
||||
# "-fmerge-all-constants",
|
||||
# "-fmsc-version=1916",
|
||||
# "-fno-delete-null-pointer-checks",
|
||||
# "-fno-ident",
|
||||
# "-ftrivial-auto-var-init=pattern",
|
||||
# "-fuse-ctor-homing",
|
||||
# "-gcodeview-ghash",
|
||||
# "-instcombine-lower-dbg-declare=0",
|
||||
# "-m64",
|
||||
@ -55,37 +59,34 @@ LOCAL_INCLUDES += [
|
||||
# "-msse3",
|
||||
# "-no-canonical-prefixes",
|
||||
# "-plugin-arg-find-bad-constructs",
|
||||
# "-Wenum-compare-conditional",
|
||||
# "-Wextra-semi",
|
||||
# "-Wheader-hygiene",
|
||||
# "-Wimplicit-fallthrough",
|
||||
# "-Wmax-tokens",
|
||||
# "-Wno-builtin-assume-aligned-alignment",
|
||||
# "-Wloop-analysis",
|
||||
# "-Wno-bitfield-constant-conversion",
|
||||
# "-Wno-builtin-macro-redefined",
|
||||
# "-Wno-c++11-narrowing",
|
||||
# "-Wno-deprecated-copy",
|
||||
# "-Wno-final-dtor-non-final-class",
|
||||
# "-Wno-deprecated-builtins",
|
||||
# "-Wno-ignored-pragma-optimize",
|
||||
# "-Wno-implicit-int-float-conversion",
|
||||
# "-Wno-missing-field-initializers",
|
||||
# "-Wno-non-c-typedef-for-linkage",
|
||||
# "-Wno-nonportable-include-path",
|
||||
# "-Wno-psabi",
|
||||
# "-Wno-trigraphs",
|
||||
# "-Wno-undefined-var-template",
|
||||
# "-Wno-unneeded-internal-declaration",
|
||||
# "-Wno-unused-parameter",
|
||||
# "-Wshadow",
|
||||
# "-Wstring-conversion",
|
||||
# "-Wtautological-overlap-compare",
|
||||
# "-Wthread-safety",
|
||||
# "-Wunreachable-code",
|
||||
# "-Wunreachable-code-aggressive",
|
||||
# "-Xclang",
|
||||
# ".",
|
||||
# "/bigobj",
|
||||
# "/Brepro",
|
||||
# "/clang:-ffp-contract=off",
|
||||
# "/D__WRL_ENABLE_FUNCTION_STATICS__",
|
||||
# "/FS",
|
||||
# "/GR-",
|
||||
# "/guard:cf,nochecks",
|
||||
# "/guard:cf",
|
||||
# "/Gw",
|
||||
# "/Gy",
|
||||
# "/MT",
|
||||
@ -93,56 +94,17 @@ LOCAL_INCLUDES += [
|
||||
# "/Ob2",
|
||||
# "/Oi",
|
||||
# "/Oy-",
|
||||
# "/std:c++17",
|
||||
# "/TP",
|
||||
# "/utf-8",
|
||||
# "/W4",
|
||||
# "/wd4091",
|
||||
# "/wd4100",
|
||||
# "/wd4121",
|
||||
# "/wd4127",
|
||||
# "/wd4200",
|
||||
# "/wd4201",
|
||||
# "/wd4204",
|
||||
# "/wd4221",
|
||||
# "/wd4244",
|
||||
# "/wd4245",
|
||||
# "/wd4251",
|
||||
# "/wd4267",
|
||||
# "/wd4275",
|
||||
# "/wd4305",
|
||||
# "/wd4312",
|
||||
# "/wd4324",
|
||||
# "/wd4351",
|
||||
# "/wd4355",
|
||||
# "/wd4389",
|
||||
# "/wd4456",
|
||||
# "/wd4457",
|
||||
# "/wd4458",
|
||||
# "/wd4459",
|
||||
# "/wd4503",
|
||||
# "/wd4505",
|
||||
# "/wd4510",
|
||||
# "/wd4512",
|
||||
# "/wd4577",
|
||||
# "/wd4589",
|
||||
# "/wd4610",
|
||||
# "/wd4611",
|
||||
# "/wd4661",
|
||||
# "/wd4701",
|
||||
# "/wd4702",
|
||||
# "/wd4703",
|
||||
# "/wd4706",
|
||||
# "/wd4715",
|
||||
# "/wd4838",
|
||||
# "/wd4995",
|
||||
# "/wd4996",
|
||||
# "/WX",
|
||||
# "/Z7",
|
||||
# "/Zc:inline",
|
||||
# "/Zc:sizedDealloc-",
|
||||
# "/Zc:twoPhase",
|
||||
# "checked-ptr-as-trivial-member",
|
||||
# "find-bad-constructs",
|
||||
# "raw-ref-template-as-trivial-member",
|
||||
# ]
|
||||
|
||||
SOURCES += [
|
||||
@ -167,7 +129,7 @@ USE_LIBS += [
|
||||
# "/pdbaltpath:%_PDB%",
|
||||
# "/PDBSourcePath:C:/dev/angle/out",
|
||||
# "/PROFILE",
|
||||
# "/TIMESTAMP:1619931600",
|
||||
# "/TIMESTAMP:1664686800",
|
||||
# "/WX",
|
||||
# ]
|
||||
|
||||
|
||||
@ -2,12 +2,15 @@
|
||||
|
||||
include("../../moz.build.common")
|
||||
|
||||
DEFINES["ANGLE_DISABLE_POOL_ALLOC"] = True
|
||||
# DEFINES["ANGLE_EGL_LIBRARY_NAME"] = '"libEGL"'
|
||||
DEFINES["ANGLE_ENABLE_SHARE_CONTEXT_LOCK"] = "1"
|
||||
DEFINES["ANGLE_GLESV2_LIBRARY_NAME"] = '"libGLESv2"'
|
||||
# DEFINES["ANGLE_IS_WIN"] = True
|
||||
DEFINES["ANGLE_USE_EGL_LOADER"] = True
|
||||
DEFINES["ANGLE_VMA_VERSION"] = "2003000"
|
||||
# DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
|
||||
DEFINES["CR_CLANG_REVISION"] = '"llvmorg-13-init-9302-g897d7bce-1"'
|
||||
DEFINES["CR_CLANG_REVISION"] = '"llvmorg-16-init-6578-g0d30e92f-2"'
|
||||
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
|
||||
DEFINES["EGLAPI"] = ""
|
||||
DEFINES["EGL_EGLEXT_PROTOTYPES"] = True
|
||||
@ -17,7 +20,7 @@ DEFINES["GL_GLEXT_PROTOTYPES"] = True
|
||||
DEFINES["LIBEGL_IMPLEMENTATION"] = True
|
||||
# DEFINES["NDEBUG"] = True
|
||||
DEFINES["NOMINMAX"] = True
|
||||
# DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_VB"
|
||||
# DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_FE"
|
||||
# DEFINES["NVALGRIND"] = True
|
||||
# DEFINES["PSAPI_VERSION"] = "2"
|
||||
DEFINES["UNICODE"] = True
|
||||
@ -27,6 +30,7 @@ DEFINES["UNICODE"] = True
|
||||
# DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
|
||||
DEFINES["WINVER"] = "0x0A00"
|
||||
DEFINES["_ATL_NO_OPENGL"] = True
|
||||
DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
|
||||
DEFINES["_CRT_RAND_S"] = True
|
||||
DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
|
||||
DEFINES["_HAS_EXCEPTIONS"] = "0"
|
||||
@ -36,6 +40,7 @@ DEFINES["_SECURE_ATL"] = True
|
||||
DEFINES["_UNICODE"] = True
|
||||
# DEFINES["_WIN32_WINNT"] = "0x0A00"
|
||||
# DEFINES["_WINDOWS"] = True
|
||||
DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
|
||||
# DEFINES["__STD_C"] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
@ -52,12 +57,14 @@ LOCAL_INCLUDES += [
|
||||
# "-fcolor-diagnostics",
|
||||
# "-fcomplete-member-pointers",
|
||||
# "-fcrash-diagnostics-dir=../tools/clang/crashreports",
|
||||
# "-fdebug-compilation-dir",
|
||||
# "-ffile-compilation-dir=.",
|
||||
# "-ffile-reproducible",
|
||||
# "-fmerge-all-constants",
|
||||
# "-fmsc-version=1916",
|
||||
# "-fno-delete-null-pointer-checks",
|
||||
# "-fno-ident",
|
||||
# "-ftrivial-auto-var-init=pattern",
|
||||
# "-fuse-ctor-homing",
|
||||
# "-gcodeview-ghash",
|
||||
# "-instcombine-lower-dbg-declare=0",
|
||||
# "-m64",
|
||||
@ -66,6 +73,7 @@ LOCAL_INCLUDES += [
|
||||
# "-no-canonical-prefixes",
|
||||
# "-Wbad-function-cast",
|
||||
# "-Wconditional-uninitialized",
|
||||
# "-Wenum-compare-conditional",
|
||||
# "-Wexit-time-destructors",
|
||||
# "-Wextra-semi",
|
||||
# "-Wextra-semi-stmt",
|
||||
@ -74,22 +82,17 @@ LOCAL_INCLUDES += [
|
||||
# "-Wheader-hygiene",
|
||||
# "-Wimplicit-fallthrough",
|
||||
# "-Winconsistent-missing-destructor-override",
|
||||
# "-Wmax-tokens",
|
||||
# "-Wloop-analysis",
|
||||
# "-Wmissing-field-initializers",
|
||||
# "-Wnewline-eof",
|
||||
# "-Wno-builtin-assume-aligned-alignment",
|
||||
# "-Wno-bitfield-constant-conversion",
|
||||
# "-Wno-builtin-macro-redefined",
|
||||
# "-Wno-c++11-narrowing",
|
||||
# "-Wno-deprecated-copy",
|
||||
# "-Wno-final-dtor-non-final-class",
|
||||
# "-Wno-deprecated-builtins",
|
||||
# "-Wno-ignored-pragma-optimize",
|
||||
# "-Wno-implicit-int-float-conversion",
|
||||
# "-Wno-missing-field-initializers",
|
||||
# "-Wno-non-c-typedef-for-linkage",
|
||||
# "-Wno-nonportable-include-path",
|
||||
# "-Wno-psabi",
|
||||
# "-Wno-trigraphs",
|
||||
# "-Wno-undefined-var-template",
|
||||
# "-Wno-unneeded-internal-declaration",
|
||||
# "-Wno-unused-parameter",
|
||||
# "-Wnon-virtual-dtor",
|
||||
@ -97,6 +100,7 @@ LOCAL_INCLUDES += [
|
||||
# "-Wrange-loop-analysis",
|
||||
# "-Wredundant-parens",
|
||||
# "-Wreturn-std-move",
|
||||
# "-Wshadow",
|
||||
# "-Wshadow-field",
|
||||
# "-Wshorten-64-to-32",
|
||||
# "-Wstrict-prototypes",
|
||||
@ -108,16 +112,16 @@ LOCAL_INCLUDES += [
|
||||
# "-Wthread-safety",
|
||||
# "-Wundefined-reinterpret-cast",
|
||||
# "-Wunneeded-internal-declaration",
|
||||
# "-Wunreachable-code",
|
||||
# "-Wweak-template-vtables",
|
||||
# "-Wunreachable-code-aggressive",
|
||||
# "-Wunused-but-set-variable",
|
||||
# "-Xclang",
|
||||
# ".",
|
||||
# "/bigobj",
|
||||
# "/Brepro",
|
||||
# "/clang:-ffp-contract=off",
|
||||
# "/D__WRL_ENABLE_FUNCTION_STATICS__",
|
||||
# "/FS",
|
||||
# "/GR-",
|
||||
# "/guard:cf,nochecks",
|
||||
# "/guard:cf",
|
||||
# "/Gw",
|
||||
# "/Gy",
|
||||
# "/MT",
|
||||
@ -125,49 +129,10 @@ LOCAL_INCLUDES += [
|
||||
# "/Ob2",
|
||||
# "/Oi",
|
||||
# "/Oy-",
|
||||
# "/std:c++17",
|
||||
# "/TP",
|
||||
# "/utf-8",
|
||||
# "/W4",
|
||||
# "/wd4091",
|
||||
# "/wd4100",
|
||||
# "/wd4121",
|
||||
# "/wd4127",
|
||||
# "/wd4200",
|
||||
# "/wd4201",
|
||||
# "/wd4204",
|
||||
# "/wd4221",
|
||||
# "/wd4244",
|
||||
# "/wd4245",
|
||||
# "/wd4251",
|
||||
# "/wd4267",
|
||||
# "/wd4275",
|
||||
# "/wd4305",
|
||||
# "/wd4312",
|
||||
# "/wd4324",
|
||||
# "/wd4351",
|
||||
# "/wd4355",
|
||||
# "/wd4389",
|
||||
# "/wd4456",
|
||||
# "/wd4457",
|
||||
# "/wd4458",
|
||||
# "/wd4459",
|
||||
# "/wd4503",
|
||||
# "/wd4505",
|
||||
# "/wd4510",
|
||||
# "/wd4512",
|
||||
# "/wd4577",
|
||||
# "/wd4589",
|
||||
# "/wd4610",
|
||||
# "/wd4611",
|
||||
# "/wd4661",
|
||||
# "/wd4701",
|
||||
# "/wd4702",
|
||||
# "/wd4703",
|
||||
# "/wd4706",
|
||||
# "/wd4715",
|
||||
# "/wd4838",
|
||||
# "/wd4995",
|
||||
# "/wd4996",
|
||||
# "/we4244",
|
||||
# "/we4312",
|
||||
# "/we4456",
|
||||
@ -234,7 +199,6 @@ OS_LIBS += [
|
||||
# "/ignore:4221",
|
||||
# "/INCREMENTAL:NO",
|
||||
# "/lldignoreenv",
|
||||
# "/MACHINE:X64",
|
||||
# "/NXCOMPAT",
|
||||
# "/OPT:ICF",
|
||||
# "/OPT:NOLLDTAILMERGE",
|
||||
@ -243,7 +207,7 @@ OS_LIBS += [
|
||||
# "/PDBSourcePath:C:/dev/angle/out",
|
||||
# "/PROFILE",
|
||||
# "/SUBSYSTEM:CONSOLE,5.02",
|
||||
# "/TIMESTAMP:1619931600",
|
||||
# "/TIMESTAMP:1664686800",
|
||||
# "/WX",
|
||||
# ]
|
||||
|
||||
|
||||
@ -3,13 +3,16 @@
|
||||
include("../../moz.build.common")
|
||||
|
||||
DEFINES["ANGLE_CAPTURE_ENABLED"] = "0"
|
||||
DEFINES["ANGLE_DISABLE_POOL_ALLOC"] = True
|
||||
DEFINES["ANGLE_ENABLE_D3D11"] = True
|
||||
DEFINES["ANGLE_ENABLE_D3D11_COMPOSITOR_NATIVE_WINDOW"] = True
|
||||
DEFINES["ANGLE_ENABLE_D3D9"] = True
|
||||
DEFINES["ANGLE_ENABLE_SHARE_CONTEXT_LOCK"] = "1"
|
||||
# DEFINES["ANGLE_IS_WIN"] = True
|
||||
# DEFINES["ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES"] = "{ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" }"
|
||||
DEFINES["ANGLE_VMA_VERSION"] = "2003000"
|
||||
# DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
|
||||
DEFINES["CR_CLANG_REVISION"] = '"llvmorg-13-init-9302-g897d7bce-1"'
|
||||
DEFINES["CR_CLANG_REVISION"] = '"llvmorg-16-init-6578-g0d30e92f-2"'
|
||||
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
|
||||
DEFINES["EGL_EGLEXT_PROTOTYPES"] = True
|
||||
DEFINES["EGL_EGL_PROTOTYPES"] = "1"
|
||||
@ -21,7 +24,7 @@ DEFINES["LIBANGLE_IMPLEMENTATION"] = True
|
||||
DEFINES["LIBGLESV2_IMPLEMENTATION"] = True
|
||||
# DEFINES["NDEBUG"] = True
|
||||
DEFINES["NOMINMAX"] = True
|
||||
# DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_VB"
|
||||
# DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_FE"
|
||||
# DEFINES["NVALGRIND"] = True
|
||||
# DEFINES["PSAPI_VERSION"] = "2"
|
||||
DEFINES["UNICODE"] = True
|
||||
@ -31,6 +34,7 @@ DEFINES["UNICODE"] = True
|
||||
# DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
|
||||
DEFINES["WINVER"] = "0x0A00"
|
||||
DEFINES["_ATL_NO_OPENGL"] = True
|
||||
DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
|
||||
DEFINES["_CRT_RAND_S"] = True
|
||||
DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
|
||||
DEFINES["_HAS_EXCEPTIONS"] = "0"
|
||||
@ -40,6 +44,7 @@ DEFINES["_SECURE_ATL"] = True
|
||||
DEFINES["_UNICODE"] = True
|
||||
# DEFINES["_WIN32_WINNT"] = "0x0A00"
|
||||
# DEFINES["_WINDOWS"] = True
|
||||
DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
|
||||
# DEFINES["__STD_C"] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
@ -59,12 +64,14 @@ LOCAL_INCLUDES += [
|
||||
# "-fcolor-diagnostics",
|
||||
# "-fcomplete-member-pointers",
|
||||
# "-fcrash-diagnostics-dir=../tools/clang/crashreports",
|
||||
# "-fdebug-compilation-dir",
|
||||
# "-ffile-compilation-dir=.",
|
||||
# "-ffile-reproducible",
|
||||
# "-fmerge-all-constants",
|
||||
# "-fmsc-version=1916",
|
||||
# "-fno-delete-null-pointer-checks",
|
||||
# "-fno-ident",
|
||||
# "-ftrivial-auto-var-init=pattern",
|
||||
# "-fuse-ctor-homing",
|
||||
# "-gcodeview-ghash",
|
||||
# "-instcombine-lower-dbg-declare=0",
|
||||
# "-m64",
|
||||
@ -74,6 +81,7 @@ LOCAL_INCLUDES += [
|
||||
# "-plugin-arg-find-bad-constructs",
|
||||
# "-Wbad-function-cast",
|
||||
# "-Wconditional-uninitialized",
|
||||
# "-Wenum-compare-conditional",
|
||||
# "-Wexit-time-destructors",
|
||||
# "-Wextra-semi",
|
||||
# "-Wextra-semi-stmt",
|
||||
@ -82,22 +90,17 @@ LOCAL_INCLUDES += [
|
||||
# "-Wheader-hygiene",
|
||||
# "-Wimplicit-fallthrough",
|
||||
# "-Winconsistent-missing-destructor-override",
|
||||
# "-Wmax-tokens",
|
||||
# "-Wloop-analysis",
|
||||
# "-Wmissing-field-initializers",
|
||||
# "-Wnewline-eof",
|
||||
# "-Wno-builtin-assume-aligned-alignment",
|
||||
# "-Wno-bitfield-constant-conversion",
|
||||
# "-Wno-builtin-macro-redefined",
|
||||
# "-Wno-c++11-narrowing",
|
||||
# "-Wno-deprecated-copy",
|
||||
# "-Wno-final-dtor-non-final-class",
|
||||
# "-Wno-deprecated-builtins",
|
||||
# "-Wno-ignored-pragma-optimize",
|
||||
# "-Wno-implicit-int-float-conversion",
|
||||
# "-Wno-missing-field-initializers",
|
||||
# "-Wno-non-c-typedef-for-linkage",
|
||||
# "-Wno-nonportable-include-path",
|
||||
# "-Wno-psabi",
|
||||
# "-Wno-trigraphs",
|
||||
# "-Wno-undefined-var-template",
|
||||
# "-Wno-unneeded-internal-declaration",
|
||||
# "-Wno-unused-parameter",
|
||||
# "-Wnon-virtual-dtor",
|
||||
@ -105,6 +108,7 @@ LOCAL_INCLUDES += [
|
||||
# "-Wrange-loop-analysis",
|
||||
# "-Wredundant-parens",
|
||||
# "-Wreturn-std-move",
|
||||
# "-Wshadow",
|
||||
# "-Wshadow-field",
|
||||
# "-Wshorten-64-to-32",
|
||||
# "-Wstrict-prototypes",
|
||||
@ -116,16 +120,16 @@ LOCAL_INCLUDES += [
|
||||
# "-Wthread-safety",
|
||||
# "-Wundefined-reinterpret-cast",
|
||||
# "-Wunneeded-internal-declaration",
|
||||
# "-Wunreachable-code",
|
||||
# "-Wweak-template-vtables",
|
||||
# "-Wunreachable-code-aggressive",
|
||||
# "-Wunused-but-set-variable",
|
||||
# "-Xclang",
|
||||
# ".",
|
||||
# "/bigobj",
|
||||
# "/Brepro",
|
||||
# "/clang:-ffp-contract=off",
|
||||
# "/D__WRL_ENABLE_FUNCTION_STATICS__",
|
||||
# "/FS",
|
||||
# "/GR-",
|
||||
# "/guard:cf,nochecks",
|
||||
# "/guard:cf",
|
||||
# "/Gw",
|
||||
# "/Gy",
|
||||
# "/MT",
|
||||
@ -133,50 +137,11 @@ LOCAL_INCLUDES += [
|
||||
# "/Ob2",
|
||||
# "/Oi",
|
||||
# "/Oy-",
|
||||
# "/std:c++17",
|
||||
# "/TP",
|
||||
# "/utf-8",
|
||||
# "/W4",
|
||||
# "/wd4091",
|
||||
# "/wd4100",
|
||||
# "/wd4121",
|
||||
# "/wd4127",
|
||||
# "/wd4200",
|
||||
# "/wd4201",
|
||||
# "/wd4204",
|
||||
# "/wd4221",
|
||||
# "/wd4244",
|
||||
# "/wd4245",
|
||||
# "/wd4251",
|
||||
# "/wd4267",
|
||||
# "/wd4275",
|
||||
# "/wd4305",
|
||||
# "/wd4312",
|
||||
# "/wd4324",
|
||||
# "/wd4351",
|
||||
# "/wd4355",
|
||||
# "/wd4389",
|
||||
# "/wd4456",
|
||||
# "/wd4457",
|
||||
# "/wd4458",
|
||||
# "/wd4459",
|
||||
# "/wd4503",
|
||||
# "/wd4505",
|
||||
# "/wd4510",
|
||||
# "/wd4512",
|
||||
# "/wd4530",
|
||||
# "/wd4577",
|
||||
# "/wd4589",
|
||||
# "/wd4610",
|
||||
# "/wd4611",
|
||||
# "/wd4661",
|
||||
# "/wd4701",
|
||||
# "/wd4702",
|
||||
# "/wd4703",
|
||||
# "/wd4706",
|
||||
# "/wd4715",
|
||||
# "/wd4838",
|
||||
# "/wd4995",
|
||||
# "/wd4996",
|
||||
# "/we4244",
|
||||
# "/we4312",
|
||||
# "/we4456",
|
||||
@ -189,11 +154,12 @@ LOCAL_INCLUDES += [
|
||||
# "/Zc:inline",
|
||||
# "/Zc:sizedDealloc-",
|
||||
# "/Zc:twoPhase",
|
||||
# "checked-ptr-as-trivial-member",
|
||||
# "find-bad-constructs",
|
||||
# "raw-ref-template-as-trivial-member",
|
||||
# ]
|
||||
|
||||
SOURCES += [
|
||||
"../../checkout/src/common/angle_version_info.cpp",
|
||||
"../../checkout/src/libANGLE/angletypes.cpp",
|
||||
"../../checkout/src/libANGLE/AttributeMap.cpp",
|
||||
"../../checkout/src/libANGLE/BlobCache.cpp",
|
||||
@ -220,6 +186,7 @@ SOURCES += [
|
||||
"../../checkout/src/libANGLE/FramebufferAttachment.cpp",
|
||||
"../../checkout/src/libANGLE/GLES1Renderer.cpp",
|
||||
"../../checkout/src/libANGLE/GLES1State.cpp",
|
||||
"../../checkout/src/libANGLE/gles_extensions_autogen.cpp",
|
||||
"../../checkout/src/libANGLE/HandleAllocator.cpp",
|
||||
"../../checkout/src/libANGLE/Image.cpp",
|
||||
"../../checkout/src/libANGLE/ImageIndex.cpp",
|
||||
@ -227,11 +194,13 @@ SOURCES += [
|
||||
"../../checkout/src/libANGLE/LoggingAnnotator.cpp",
|
||||
"../../checkout/src/libANGLE/MemoryObject.cpp",
|
||||
"../../checkout/src/libANGLE/MemoryProgramCache.cpp",
|
||||
"../../checkout/src/libANGLE/MemoryShaderCache.cpp",
|
||||
"../../checkout/src/libANGLE/Observer.cpp",
|
||||
"../../checkout/src/libANGLE/Overlay.cpp",
|
||||
"../../checkout/src/libANGLE/Overlay_autogen.cpp",
|
||||
"../../checkout/src/libANGLE/Overlay_font_autogen.cpp",
|
||||
"../../checkout/src/libANGLE/OverlayWidgets.cpp",
|
||||
"../../checkout/src/libANGLE/PixelLocalStorage.cpp",
|
||||
"../../checkout/src/libANGLE/Platform.cpp",
|
||||
"../../checkout/src/libANGLE/Program.cpp",
|
||||
"../../checkout/src/libANGLE/ProgramExecutable.cpp",
|
||||
@ -332,13 +301,19 @@ SOURCES += [
|
||||
"../../checkout/src/libANGLE/renderer/EGLReusableSync.cpp",
|
||||
"../../checkout/src/libANGLE/renderer/EGLSyncImpl.cpp",
|
||||
"../../checkout/src/libANGLE/renderer/Format_table_autogen.cpp",
|
||||
"../../checkout/src/libANGLE/renderer/FramebufferImpl.cpp",
|
||||
"../../checkout/src/libANGLE/renderer/ImageImpl.cpp",
|
||||
"../../checkout/src/libANGLE/renderer/load_functions_table_autogen.cpp",
|
||||
"../../checkout/src/libANGLE/renderer/ProgramImpl.cpp",
|
||||
"../../checkout/src/libANGLE/renderer/ProgramPipelineImpl.cpp",
|
||||
"../../checkout/src/libANGLE/renderer/QueryImpl.cpp",
|
||||
"../../checkout/src/libANGLE/renderer/RenderbufferImpl.cpp",
|
||||
"../../checkout/src/libANGLE/renderer/renderer_utils.cpp",
|
||||
"../../checkout/src/libANGLE/renderer/ShaderImpl.cpp",
|
||||
"../../checkout/src/libANGLE/renderer/SurfaceImpl.cpp",
|
||||
"../../checkout/src/libANGLE/renderer/TextureImpl.cpp",
|
||||
"../../checkout/src/libANGLE/renderer/TransformFeedbackImpl.cpp",
|
||||
"../../checkout/src/libANGLE/renderer/VertexArrayImpl.cpp",
|
||||
"../../checkout/src/libANGLE/ResourceManager.cpp",
|
||||
"../../checkout/src/libANGLE/Sampler.cpp",
|
||||
"../../checkout/src/libANGLE/Semaphore.cpp",
|
||||
@ -440,7 +415,6 @@ OS_LIBS += [
|
||||
# "/ignore:4221",
|
||||
# "/INCREMENTAL:NO",
|
||||
# "/lldignoreenv",
|
||||
# "/MACHINE:X64",
|
||||
# "/NXCOMPAT",
|
||||
# "/OPT:ICF",
|
||||
# "/OPT:NOLLDTAILMERGE",
|
||||
@ -449,7 +423,7 @@ OS_LIBS += [
|
||||
# "/PDBSourcePath:C:/dev/angle/out",
|
||||
# "/PROFILE",
|
||||
# "/SUBSYSTEM:CONSOLE,5.02",
|
||||
# "/TIMESTAMP:1619931600",
|
||||
# "/TIMESTAMP:1664686800",
|
||||
# "/WX",
|
||||
# ]
|
||||
|
||||
|
||||
@ -2,13 +2,16 @@
|
||||
|
||||
include("../../moz.build.common")
|
||||
|
||||
DEFINES["ANGLE_DISABLE_POOL_ALLOC"] = True
|
||||
DEFINES["ANGLE_ENABLE_SHARE_CONTEXT_LOCK"] = "1"
|
||||
# DEFINES["ANGLE_IS_WIN"] = True
|
||||
DEFINES["ANGLE_VMA_VERSION"] = "2003000"
|
||||
# DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
|
||||
DEFINES["CR_CLANG_REVISION"] = '"llvmorg-13-init-9302-g897d7bce-1"'
|
||||
DEFINES["CR_CLANG_REVISION"] = '"llvmorg-16-init-6578-g0d30e92f-2"'
|
||||
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
|
||||
# DEFINES["NDEBUG"] = True
|
||||
DEFINES["NOMINMAX"] = True
|
||||
# DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_VB"
|
||||
# DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_FE"
|
||||
# DEFINES["NVALGRIND"] = True
|
||||
# DEFINES["PSAPI_VERSION"] = "2"
|
||||
DEFINES["UNICODE"] = True
|
||||
@ -18,6 +21,7 @@ DEFINES["UNICODE"] = True
|
||||
# DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
|
||||
DEFINES["WINVER"] = "0x0A00"
|
||||
DEFINES["_ATL_NO_OPENGL"] = True
|
||||
DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
|
||||
DEFINES["_CRT_RAND_S"] = True
|
||||
DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
|
||||
DEFINES["_HAS_EXCEPTIONS"] = "0"
|
||||
@ -27,11 +31,11 @@ DEFINES["_SECURE_ATL"] = True
|
||||
DEFINES["_UNICODE"] = True
|
||||
# DEFINES["_WIN32_WINNT"] = "0x0A00"
|
||||
# DEFINES["_WINDOWS"] = True
|
||||
DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
|
||||
# DEFINES["__STD_C"] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
"../../checkout/include/",
|
||||
"../../checkout/out/gen/angle/",
|
||||
"../../checkout/src/",
|
||||
"../../checkout/src/common/third_party/base/",
|
||||
]
|
||||
@ -43,12 +47,14 @@ LOCAL_INCLUDES += [
|
||||
# "-fcolor-diagnostics",
|
||||
# "-fcomplete-member-pointers",
|
||||
# "-fcrash-diagnostics-dir=../tools/clang/crashreports",
|
||||
# "-fdebug-compilation-dir",
|
||||
# "-ffile-compilation-dir=.",
|
||||
# "-ffile-reproducible",
|
||||
# "-fmerge-all-constants",
|
||||
# "-fmsc-version=1916",
|
||||
# "-fno-delete-null-pointer-checks",
|
||||
# "-fno-ident",
|
||||
# "-ftrivial-auto-var-init=pattern",
|
||||
# "-fuse-ctor-homing",
|
||||
# "-gcodeview-ghash",
|
||||
# "-instcombine-lower-dbg-declare=0",
|
||||
# "-m64",
|
||||
@ -57,6 +63,7 @@ LOCAL_INCLUDES += [
|
||||
# "-no-canonical-prefixes",
|
||||
# "-Wbad-function-cast",
|
||||
# "-Wconditional-uninitialized",
|
||||
# "-Wenum-compare-conditional",
|
||||
# "-Wexit-time-destructors",
|
||||
# "-Wextra-semi",
|
||||
# "-Wextra-semi-stmt",
|
||||
@ -65,29 +72,26 @@ LOCAL_INCLUDES += [
|
||||
# "-Wheader-hygiene",
|
||||
# "-Wimplicit-fallthrough",
|
||||
# "-Winconsistent-missing-destructor-override",
|
||||
# "-Wmax-tokens",
|
||||
# "-Wloop-analysis",
|
||||
# "-Wmissing-field-initializers",
|
||||
# "-Wnewline-eof",
|
||||
# "-Wno-builtin-assume-aligned-alignment",
|
||||
# "-Wno-bitfield-constant-conversion",
|
||||
# "-Wno-builtin-macro-redefined",
|
||||
# "-Wno-c++11-narrowing",
|
||||
# "-Wno-deprecated-copy",
|
||||
# "-Wno-final-dtor-non-final-class",
|
||||
# "-Wno-deprecated-builtins",
|
||||
# "-Wno-ignored-pragma-optimize",
|
||||
# "-Wno-implicit-int-float-conversion",
|
||||
# "-Wno-missing-field-initializers",
|
||||
# "-Wno-non-c-typedef-for-linkage",
|
||||
# "-Wno-nonportable-include-path",
|
||||
# "-Wno-psabi",
|
||||
# "-Wno-trigraphs",
|
||||
# "-Wno-undefined-var-template",
|
||||
# "-Wno-unneeded-internal-declaration",
|
||||
# "-Wno-unreachable-code-break",
|
||||
# "-Wno-unused-parameter",
|
||||
# "-Wnon-virtual-dtor",
|
||||
# "-Wparentheses",
|
||||
# "-Wrange-loop-analysis",
|
||||
# "-Wredundant-parens",
|
||||
# "-Wreturn-std-move",
|
||||
# "-Wshadow",
|
||||
# "-Wshadow-field",
|
||||
# "-Wshorten-64-to-32",
|
||||
# "-Wstrict-prototypes",
|
||||
@ -99,16 +103,16 @@ LOCAL_INCLUDES += [
|
||||
# "-Wthread-safety",
|
||||
# "-Wundefined-reinterpret-cast",
|
||||
# "-Wunneeded-internal-declaration",
|
||||
# "-Wunreachable-code",
|
||||
# "-Wweak-template-vtables",
|
||||
# "-Wunreachable-code-aggressive",
|
||||
# "-Wunused-but-set-variable",
|
||||
# "-Xclang",
|
||||
# ".",
|
||||
# "/bigobj",
|
||||
# "/Brepro",
|
||||
# "/clang:-ffp-contract=off",
|
||||
# "/D__WRL_ENABLE_FUNCTION_STATICS__",
|
||||
# "/FS",
|
||||
# "/GR-",
|
||||
# "/guard:cf,nochecks",
|
||||
# "/guard:cf",
|
||||
# "/Gw",
|
||||
# "/Gy",
|
||||
# "/MT",
|
||||
@ -116,49 +120,10 @@ LOCAL_INCLUDES += [
|
||||
# "/Ob2",
|
||||
# "/Oi",
|
||||
# "/Oy-",
|
||||
# "/std:c++17",
|
||||
# "/TP",
|
||||
# "/utf-8",
|
||||
# "/W4",
|
||||
# "/wd4091",
|
||||
# "/wd4100",
|
||||
# "/wd4121",
|
||||
# "/wd4127",
|
||||
# "/wd4200",
|
||||
# "/wd4201",
|
||||
# "/wd4204",
|
||||
# "/wd4221",
|
||||
# "/wd4244",
|
||||
# "/wd4245",
|
||||
# "/wd4251",
|
||||
# "/wd4267",
|
||||
# "/wd4275",
|
||||
# "/wd4305",
|
||||
# "/wd4312",
|
||||
# "/wd4324",
|
||||
# "/wd4351",
|
||||
# "/wd4355",
|
||||
# "/wd4389",
|
||||
# "/wd4456",
|
||||
# "/wd4457",
|
||||
# "/wd4458",
|
||||
# "/wd4459",
|
||||
# "/wd4503",
|
||||
# "/wd4505",
|
||||
# "/wd4510",
|
||||
# "/wd4512",
|
||||
# "/wd4577",
|
||||
# "/wd4589",
|
||||
# "/wd4610",
|
||||
# "/wd4611",
|
||||
# "/wd4661",
|
||||
# "/wd4701",
|
||||
# "/wd4702",
|
||||
# "/wd4703",
|
||||
# "/wd4706",
|
||||
# "/wd4715",
|
||||
# "/wd4838",
|
||||
# "/wd4995",
|
||||
# "/wd4996",
|
||||
# "/we4244",
|
||||
# "/we4312",
|
||||
# "/we4456",
|
||||
@ -209,7 +174,7 @@ DIRS += [
|
||||
# "/pdbaltpath:%_PDB%",
|
||||
# "/PDBSourcePath:C:/dev/angle/out",
|
||||
# "/PROFILE",
|
||||
# "/TIMESTAMP:1619931600",
|
||||
# "/TIMESTAMP:1664686800",
|
||||
# "/WX",
|
||||
# ]
|
||||
|
||||
|
||||
@ -2,16 +2,20 @@
|
||||
|
||||
include("../../moz.build.common")
|
||||
|
||||
DEFINES["ANGLE_DISABLE_POOL_ALLOC"] = True
|
||||
DEFINES["ANGLE_ENABLE_APPLE_WORKAROUNDS"] = True
|
||||
DEFINES["ANGLE_ENABLE_ESSL"] = True
|
||||
DEFINES["ANGLE_ENABLE_GLSL"] = True
|
||||
DEFINES["ANGLE_ENABLE_HLSL"] = True
|
||||
DEFINES["ANGLE_ENABLE_SHARE_CONTEXT_LOCK"] = "1"
|
||||
# DEFINES["ANGLE_IS_WIN"] = True
|
||||
DEFINES["ANGLE_VMA_VERSION"] = "2003000"
|
||||
# DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
|
||||
DEFINES["CR_CLANG_REVISION"] = '"llvmorg-13-init-9302-g897d7bce-1"'
|
||||
DEFINES["CR_CLANG_REVISION"] = '"llvmorg-16-init-6578-g0d30e92f-2"'
|
||||
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
|
||||
# DEFINES["NDEBUG"] = True
|
||||
DEFINES["NOMINMAX"] = True
|
||||
# DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_VB"
|
||||
# DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_FE"
|
||||
# DEFINES["NVALGRIND"] = True
|
||||
# DEFINES["PSAPI_VERSION"] = "2"
|
||||
DEFINES["UNICODE"] = True
|
||||
@ -21,6 +25,7 @@ DEFINES["UNICODE"] = True
|
||||
# DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
|
||||
DEFINES["WINVER"] = "0x0A00"
|
||||
DEFINES["_ATL_NO_OPENGL"] = True
|
||||
DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
|
||||
DEFINES["_CRT_RAND_S"] = True
|
||||
DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
|
||||
DEFINES["_HAS_EXCEPTIONS"] = "0"
|
||||
@ -30,11 +35,11 @@ DEFINES["_SECURE_ATL"] = True
|
||||
DEFINES["_UNICODE"] = True
|
||||
# DEFINES["_WIN32_WINNT"] = "0x0A00"
|
||||
# DEFINES["_WINDOWS"] = True
|
||||
DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
|
||||
# DEFINES["__STD_C"] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
"../../checkout/include/",
|
||||
"../../checkout/out/gen/angle/",
|
||||
"../../checkout/src/",
|
||||
"../../checkout/src/common/third_party/base/",
|
||||
]
|
||||
@ -46,12 +51,14 @@ LOCAL_INCLUDES += [
|
||||
# "-fcolor-diagnostics",
|
||||
# "-fcomplete-member-pointers",
|
||||
# "-fcrash-diagnostics-dir=../tools/clang/crashreports",
|
||||
# "-fdebug-compilation-dir",
|
||||
# "-ffile-compilation-dir=.",
|
||||
# "-ffile-reproducible",
|
||||
# "-fmerge-all-constants",
|
||||
# "-fmsc-version=1916",
|
||||
# "-fno-delete-null-pointer-checks",
|
||||
# "-fno-ident",
|
||||
# "-ftrivial-auto-var-init=pattern",
|
||||
# "-fuse-ctor-homing",
|
||||
# "-gcodeview-ghash",
|
||||
# "-instcombine-lower-dbg-declare=0",
|
||||
# "-m64",
|
||||
@ -60,6 +67,7 @@ LOCAL_INCLUDES += [
|
||||
# "-no-canonical-prefixes",
|
||||
# "-Wbad-function-cast",
|
||||
# "-Wconditional-uninitialized",
|
||||
# "-Wenum-compare-conditional",
|
||||
# "-Wexit-time-destructors",
|
||||
# "-Wextra-semi",
|
||||
# "-Wextra-semi-stmt",
|
||||
@ -68,22 +76,17 @@ LOCAL_INCLUDES += [
|
||||
# "-Wheader-hygiene",
|
||||
# "-Wimplicit-fallthrough",
|
||||
# "-Winconsistent-missing-destructor-override",
|
||||
# "-Wmax-tokens",
|
||||
# "-Wloop-analysis",
|
||||
# "-Wmissing-field-initializers",
|
||||
# "-Wnewline-eof",
|
||||
# "-Wno-builtin-assume-aligned-alignment",
|
||||
# "-Wno-bitfield-constant-conversion",
|
||||
# "-Wno-builtin-macro-redefined",
|
||||
# "-Wno-c++11-narrowing",
|
||||
# "-Wno-deprecated-copy",
|
||||
# "-Wno-final-dtor-non-final-class",
|
||||
# "-Wno-deprecated-builtins",
|
||||
# "-Wno-ignored-pragma-optimize",
|
||||
# "-Wno-implicit-int-float-conversion",
|
||||
# "-Wno-missing-field-initializers",
|
||||
# "-Wno-non-c-typedef-for-linkage",
|
||||
# "-Wno-nonportable-include-path",
|
||||
# "-Wno-psabi",
|
||||
# "-Wno-trigraphs",
|
||||
# "-Wno-undefined-var-template",
|
||||
# "-Wno-unneeded-internal-declaration",
|
||||
# "-Wno-unused-parameter",
|
||||
# "-Wnon-virtual-dtor",
|
||||
@ -91,6 +94,7 @@ LOCAL_INCLUDES += [
|
||||
# "-Wrange-loop-analysis",
|
||||
# "-Wredundant-parens",
|
||||
# "-Wreturn-std-move",
|
||||
# "-Wshadow",
|
||||
# "-Wshadow-field",
|
||||
# "-Wshorten-64-to-32",
|
||||
# "-Wstrict-prototypes",
|
||||
@ -102,16 +106,16 @@ LOCAL_INCLUDES += [
|
||||
# "-Wthread-safety",
|
||||
# "-Wundefined-reinterpret-cast",
|
||||
# "-Wunneeded-internal-declaration",
|
||||
# "-Wunreachable-code",
|
||||
# "-Wweak-template-vtables",
|
||||
# "-Wunreachable-code-aggressive",
|
||||
# "-Wunused-but-set-variable",
|
||||
# "-Xclang",
|
||||
# ".",
|
||||
# "/bigobj",
|
||||
# "/Brepro",
|
||||
# "/clang:-ffp-contract=off",
|
||||
# "/D__WRL_ENABLE_FUNCTION_STATICS__",
|
||||
# "/FS",
|
||||
# "/GR-",
|
||||
# "/guard:cf,nochecks",
|
||||
# "/guard:cf",
|
||||
# "/Gw",
|
||||
# "/Gy",
|
||||
# "/MT",
|
||||
@ -119,50 +123,11 @@ LOCAL_INCLUDES += [
|
||||
# "/Ob2",
|
||||
# "/Oi",
|
||||
# "/Oy-",
|
||||
# "/std:c++17",
|
||||
# "/TP",
|
||||
# "/utf-8",
|
||||
# "/W4",
|
||||
# "/wd4091",
|
||||
# "/wd4100",
|
||||
# "/wd4121",
|
||||
# "/wd4127",
|
||||
# "/wd4200",
|
||||
# "/wd4201",
|
||||
# "/wd4204",
|
||||
# "/wd4221",
|
||||
# "/wd4244",
|
||||
# "/wd4245",
|
||||
# "/wd4251",
|
||||
# "/wd4267",
|
||||
# "/wd4275",
|
||||
# "/wd4305",
|
||||
# "/wd4312",
|
||||
# "/wd4324",
|
||||
# "/wd4351",
|
||||
# "/wd4355",
|
||||
# "/wd4389",
|
||||
# "/wd4456",
|
||||
# "/wd4457",
|
||||
# "/wd4458",
|
||||
# "/wd4459",
|
||||
# "/wd4503",
|
||||
# "/wd4505",
|
||||
# "/wd4510",
|
||||
# "/wd4512",
|
||||
# "/wd4577",
|
||||
# "/wd4589",
|
||||
# "/wd4610",
|
||||
# "/wd4611",
|
||||
# "/wd4661",
|
||||
# "/wd4701",
|
||||
# "/wd4702",
|
||||
# "/wd4703",
|
||||
# "/wd4706",
|
||||
# "/wd4715",
|
||||
# "/wd4718",
|
||||
# "/wd4838",
|
||||
# "/wd4995",
|
||||
# "/wd4996",
|
||||
# "/we4244",
|
||||
# "/we4312",
|
||||
# "/we4456",
|
||||
@ -180,6 +145,7 @@ LOCAL_INCLUDES += [
|
||||
SOURCES += [
|
||||
"../../checkout/src/compiler/translator/ASTMetadataHLSL.cpp",
|
||||
"../../checkout/src/compiler/translator/AtomicCounterFunctionHLSL.cpp",
|
||||
"../../checkout/src/compiler/translator/BaseTypes.cpp",
|
||||
"../../checkout/src/compiler/translator/blocklayout.cpp",
|
||||
"../../checkout/src/compiler/translator/blocklayoutHLSL.cpp",
|
||||
"../../checkout/src/compiler/translator/BuiltInFunctionEmulator.cpp",
|
||||
@ -203,7 +169,6 @@ SOURCES += [
|
||||
"../../checkout/src/compiler/translator/glslang_tab_autogen.cpp",
|
||||
"../../checkout/src/compiler/translator/HashNames.cpp",
|
||||
"../../checkout/src/compiler/translator/ImageFunctionHLSL.cpp",
|
||||
"../../checkout/src/compiler/translator/ImmutableString_autogen.cpp",
|
||||
"../../checkout/src/compiler/translator/ImmutableString_ESSL_autogen.cpp",
|
||||
"../../checkout/src/compiler/translator/ImmutableStringBuilder.cpp",
|
||||
"../../checkout/src/compiler/translator/InfoSink.cpp",
|
||||
@ -228,15 +193,23 @@ SOURCES += [
|
||||
"../../checkout/src/compiler/translator/StructureHLSL.cpp",
|
||||
"../../checkout/src/compiler/translator/Symbol.cpp",
|
||||
"../../checkout/src/compiler/translator/SymbolTable.cpp",
|
||||
"../../checkout/src/compiler/translator/SymbolTable_autogen.cpp",
|
||||
"../../checkout/src/compiler/translator/SymbolTable_ESSL_autogen.cpp",
|
||||
"../../checkout/src/compiler/translator/SymbolUniqueId.cpp",
|
||||
"../../checkout/src/compiler/translator/TextureFunctionHLSL.cpp",
|
||||
"../../checkout/src/compiler/translator/TranslatorESSL.cpp",
|
||||
"../../checkout/src/compiler/translator/TranslatorGLSL.cpp",
|
||||
"../../checkout/src/compiler/translator/TranslatorHLSL.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/apple/AddAndTrueToLoopCondition.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/apple/RewriteDoWhile.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/apple/RewriteRowMajorMatrices.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/apple/RewriteUnaryMinusOperatorFloat.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/apple/UnfoldShortCircuitAST.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/ClampIndirectIndices.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/ClampPointSize.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/ConvertUnsupportedConstructorsToFunctionCalls.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/d3d/AddDefaultReturnStatements.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/d3d/AggregateAssignArraysInSSBOs.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/d3d/AggregateAssignStructsInSSBOs.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/d3d/ArrayReturnValueToOutParameter.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/d3d/BreakVariableAliasingInInnerLoops.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/d3d/ExpandIntegerPowExpressions.cpp",
|
||||
@ -255,38 +228,44 @@ SOURCES += [
|
||||
"../../checkout/src/compiler/translator/tree_ops/DeferGlobalInitializers.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/EmulateMultiDrawShaderBuiltins.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/EmulatePrecision.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/FoldExpressions.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/ForcePrecisionQualifier.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/gl/ClampFragDepth.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/gl/mac/AddAndTrueToLoopCondition.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/gl/mac/RewriteDoWhile.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/gl/mac/RewriteRowMajorMatrices.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/gl/mac/RewriteUnaryMinusOperatorFloat.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/gl/mac/UnfoldShortCircuitAST.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/gl/RecordConstantPrecision.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/gl/RegenerateStructNames.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/gl/RewriteRepeatedAssignToSwizzled.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/gl/UseInterfaceBlockFields.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/gl/VectorizeVectorScalarArithmetic.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/InitializeVariables.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/MonomorphizeUnsupportedFunctions.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/NameNamelessUniformBuffers.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/PruneEmptyCases.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/PruneNoOps.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/RecordConstantPrecision.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/RemoveArrayLengthMethod.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/RemoveAtomicCounterBuiltins.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/RemoveDynamicIndexing.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/RemoveInactiveInterfaceVariables.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/RemoveInvariantDeclaration.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/RemoveUnreferencedVariables.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/RewriteArrayOfArrayOfOpaqueUniforms.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/RewriteAtomicCounters.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/RewriteCubeMapSamplersAs2DArray.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/RewriteDfdy.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/RewritePixelLocalStorage.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/RewriteStructSamplers.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/RewriteTexelFetchOffset.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/SeparateDeclarations.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/SeparateStructFromUniformDeclarations.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/SimplifyLoopConditions.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_ops/SplitSequenceOperator.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_util/DriverUniform.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_util/FindFunction.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_util/FindMain.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_util/FindPreciseNodes.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_util/FindSymbolNode.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_util/IntermNode_util.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_util/IntermNodePatternMatcher.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_util/IntermRebuild.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_util/IntermTraverse.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_util/ReplaceArrayOfMatrixVarying.cpp",
|
||||
"../../checkout/src/compiler/translator/tree_util/ReplaceClipCullDistanceVariable.cpp",
|
||||
@ -307,10 +286,10 @@ SOURCES += [
|
||||
"../../checkout/src/compiler/translator/ValidateMaxParameters.cpp",
|
||||
"../../checkout/src/compiler/translator/ValidateOutputs.cpp",
|
||||
"../../checkout/src/compiler/translator/ValidateSwitch.cpp",
|
||||
"../../checkout/src/compiler/translator/ValidateTypeSizeLimitations.cpp",
|
||||
"../../checkout/src/compiler/translator/ValidateVaryingLocations.cpp",
|
||||
"../../checkout/src/compiler/translator/VariablePacker.cpp",
|
||||
"../../checkout/src/compiler/translator/VersionGLSL.cpp",
|
||||
"../../checkout/src/third_party/compiler/ArrayBoundsClamper.cpp",
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
@ -337,7 +316,7 @@ DIRS += [
|
||||
# "/pdbaltpath:%_PDB%",
|
||||
# "/PDBSourcePath:C:/dev/angle/out",
|
||||
# "/PROFILE",
|
||||
# "/TIMESTAMP:1619931600",
|
||||
# "/TIMESTAMP:1664686800",
|
||||
# "/WX",
|
||||
# ]
|
||||
|
||||
|
||||
@ -154,12 +154,15 @@ is_clang = true
|
||||
is_debug = false
|
||||
angle_build_all = false
|
||||
angle_enable_abseil = false
|
||||
angle_enable_apple_translator_workarounds = true
|
||||
angle_enable_essl = true
|
||||
angle_enable_gl = false
|
||||
angle_enable_gl_desktop = false
|
||||
angle_enable_gl_desktop_frontend = false
|
||||
angle_enable_glsl = true
|
||||
angle_enable_null = false
|
||||
angle_enable_share_context_lock = true
|
||||
angle_enable_vulkan = false
|
||||
angle_has_astc_encoder = false
|
||||
use_custom_libcxx = false
|
||||
"""[
|
||||
1:
|
||||
@ -244,7 +247,9 @@ def append_arr(dest, name, vals, indent=0):
|
||||
REGISTERED_DEFINES = {
|
||||
"ADLER32_SIMD_SSSE3": False,
|
||||
"ANGLE_CAPTURE_ENABLED": True,
|
||||
"ANGLE_DISABLE_POOL_ALLOC": True,
|
||||
"ANGLE_EGL_LIBRARY_NAME": False,
|
||||
"ANGLE_ENABLE_APPLE_WORKAROUNDS": True,
|
||||
"ANGLE_ENABLE_D3D11": True,
|
||||
"ANGLE_ENABLE_D3D11_COMPOSITOR_NATIVE_WINDOW": True,
|
||||
"ANGLE_ENABLE_D3D9": True,
|
||||
@ -255,13 +260,21 @@ REGISTERED_DEFINES = {
|
||||
"ANGLE_ENABLE_ESSL": True,
|
||||
"ANGLE_ENABLE_GLSL": True,
|
||||
"ANGLE_ENABLE_HLSL": True,
|
||||
"ANGLE_ENABLE_SHARE_CONTEXT_LOCK": True,
|
||||
"ANGLE_GENERATE_SHADER_DEBUG_INFO": True,
|
||||
"ANGLE_GLESV2_LIBRARY_NAME": True,
|
||||
"ANGLE_HAS_ASTCENC": True,
|
||||
"ANGLE_HAS_VULKAN_SYSTEM_INFO": False,
|
||||
"ANGLE_IS_64_BIT_CPU": False,
|
||||
"ANGLE_IS_WIN": False,
|
||||
"ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES": False,
|
||||
"ANGLE_SHARED_LIBVULKAN": True,
|
||||
"ANGLE_USE_CUSTOM_LIBVULKAN": True,
|
||||
"ANGLE_USE_EGL_LOADER": True,
|
||||
"ANGLE_VK_LAYERS_DIR": True,
|
||||
"ANGLE_VK_MOCK_ICD_JSON": True,
|
||||
"ANGLE_VMA_VERSION": True,
|
||||
"ASTCENC_DECOMPRESS_ONLY": True,
|
||||
"CERT_CHAIN_PARA_HAS_EXTRA_FIELDS": False,
|
||||
"CHROMIUM_BUILD": False,
|
||||
"COMPONENT_BUILD": False,
|
||||
@ -322,6 +335,7 @@ REGISTERED_DEFINES = {
|
||||
"_USING_V110_SDK71_": False,
|
||||
"_WIN32_WINNT": False,
|
||||
"_WINDOWS": False,
|
||||
"_WINSOCK_DEPRECATED_NO_WARNINGS": True,
|
||||
"__STD_C": False,
|
||||
# clang specific
|
||||
"CR_CLANG_REVISION": True,
|
||||
|
||||
@ -72,9 +72,9 @@ def record_cherry_picks(dir_in_gecko, merge_base_origin):
|
||||
|
||||
with open(log_path, "wb") as f:
|
||||
f.write(cherries)
|
||||
f.write(b"\nCherries picked")
|
||||
f.write(b"\nAbove: cherries picked")
|
||||
f.write(b"\n" + (b"=" * 80))
|
||||
f.write(b"\nMerge base from: " + merge_base_from.encode())
|
||||
f.write(b"\nBelow: merge base from: " + merge_base_from.encode())
|
||||
f.write(b"\n\n")
|
||||
f.write(mb_info)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user