Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1633628 - Vender: Don't use ClearView if we previously used dual source blending on Intel gen6. r=jrmuizel

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D74137
This commit is contained in:
Jeff Gilbert 2020-05-08 19:28:53 +00:00
parent 2a30c1ebe6
commit 591b976783
14 changed files with 151 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/angle/checkout/include/platform/FeaturesD3D.h
View File

@ -155,6 +155,14 @@ struct FeaturesD3D : FeatureSetBase
"On some Intel drivers, using clear() may not take effect", &members,
"https://crbug.com/655534"};
// On Sandybridge, calling ClearView after using dual source blending causes the hardware to hang.
// See: https://bugzilla.mozilla.org/show_bug.cgi?id=1633628
Feature emulateClearViewAfterDualSourceBlending = {"emulate_clear_view_after_dual_source_blending",
FeatureCategory::D3DWorkarounds,
"On Sandybridge, calling ClearView after using dual source blending causes "
"the hardware to hang", &members,
"https://bugzilla.mozilla.org/show_bug.cgi?id=1633628"};
// On some Intel drivers, copying from staging storage to constant buffer storage does not
// seem to work. Work around this by keeping system memory storage as a canonical reference
// for buffer data.

4
gfx/angle/checkout/out/gen/angle/id/commit.h
View File

@ -1,3 +1,3 @@
#define ANGLE_COMMIT_HASH "3885ee272685"
#define ANGLE_COMMIT_HASH "8df54289d717"
#define ANGLE_COMMIT_HASH_SIZE 12
#define ANGLE_COMMIT_DATE "2020-01-22 18:48:23 -0800"
#define ANGLE_COMMIT_DATE "2020-05-06 11:04:42 -0700"

31
gfx/angle/checkout/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
View File

@ -505,7 +505,36 @@ angle::Result Clear11::clearFramebuffer(const gl::Context *context,
const auto &framebufferRTV = renderTarget->getRenderTargetView();
ASSERT(framebufferRTV.valid());
if ((!(mRenderer->getRenderer11DeviceCaps().supportsClearView) && needScissoredClear) ||
bool canClearView = true;
if (mRenderer->getFeatures().emulateClearViewAfterDualSourceBlending.enabled) {
// Check the current state to see if we were using dual source blending
auto isDualSource = [](auto blend) { switch (blend) {
case D3D11_BLEND_SRC1_COLOR:
case D3D11_BLEND_INV_SRC1_COLOR:
case D3D11_BLEND_SRC1_ALPHA:
case D3D11_BLEND_INV_SRC1_ALPHA:
return true;
default:
return false;
}};
FLOAT blendFactor[4];
UINT sampleMask;
ID3D11BlendState *blendState;
D3D11_BLEND_DESC blendDesc;
deviceContext1->OMGetBlendState(&blendState, blendFactor, &sampleMask);
if (blendState) {
blendState->GetDesc(&blendDesc);
// You can only use dual source blending on slot 0 so only check there
if (isDualSource(blendDesc.RenderTarget[0].SrcBlend) ||
isDualSource(blendDesc.RenderTarget[0].DestBlend) ||
isDualSource(blendDesc.RenderTarget[0].SrcBlendAlpha) ||
isDualSource(blendDesc.RenderTarget[0].DestBlendAlpha)) {
canClearView = false;
}
}
}
if ((!(mRenderer->getRenderer11DeviceCaps().supportsClearView && canClearView) && needScissoredClear) ||
clearParams.colorType != GL_FLOAT ||
(formatInfo.redBits > 0 && !clearParams.colorMaskRed) ||
(formatInfo.greenBits > 0 && !clearParams.colorMaskGreen) ||

4
gfx/angle/checkout/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
View File

@ -2435,7 +2435,9 @@ void InitializeFeatures(const Renderer11DeviceCaps &deviceCaps,
// Haswell drivers occasionally corrupt (small?) (vertex?) texture data uploads for
// 128bit formats.
features->setDataFasterThanImageUploadOn128bitFormats.enabled = false;
}
} else if (IsSandyBridge(adapterDesc.DeviceId)) {
features->emulateClearViewAfterDualSourceBlending.enabled = true;
}
}
if (IsAMD(adapterDesc.VendorId))

8
gfx/angle/checkout/src/libANGLE/renderer/driver_utils.cpp
View File

@ -22,6 +22,9 @@ namespace rx
// Referenced from https://cgit.freedesktop.org/vaapi/intel-driver/tree/src/i965_pciids.h
namespace
{
// gen6
const uint32_t SandyBridge[] = {0x0102, 0x0106, 0x010A, 0x0112, 0x0116, 0x0122, 0x0126};
// gen7
const uint32_t IvyBridge[] = {0x0152, 0x0156, 0x015A, 0x0162, 0x0166, 0x016A};
@ -92,6 +95,11 @@ bool IntelDriverVersion::operator>=(const IntelDriverVersion &version)
return !(*this < version);
}
bool IsSandyBridge(uint32_t DeviceId)
{
return std::find(std::begin(SandyBridge), std::end(SandyBridge), DeviceId) != std::end(SandyBridge);
}
bool IsIvyBridge(uint32_t DeviceId)
{
return std::find(std::begin(IvyBridge), std::end(IvyBridge), DeviceId) != std::end(IvyBridge);

1
gfx/angle/checkout/src/libANGLE/renderer/driver_utils.h
View File

@ -94,6 +94,7 @@ class IntelDriverVersion
uint16_t mVersionPart;
};
bool IsSandyBridge(uint32_t DeviceId);
bool IsIvyBridge(uint32_t DeviceId);
bool IsHaswell(uint32_t DeviceId);
bool IsBroadwell(uint32_t DeviceId);

22
gfx/angle/cherry_picks.txt
View File

@ -1,3 +1,25 @@
commit 19f1bef071c32df60d9d62a7907c42270d0a3dd7
Author: Jeff Muizelaar <jrmuizel@gmail.com>
Date: Fri May 8 15:08:24 2020 -0400
Handle a null blend state. (#23)
Null is used as the default blend state so we have to check for it.
commit 8df54289d717eb0624a0ee16fd681c73a9472af4
Author: Jeff Muizelaar <jrmuizel@gmail.com>
Date: Wed May 6 14:04:42 2020 -0400
Don't use ClearView if we previously used dual source blending on Intel gen6. (#22)
Doing a ClearView after a dual source blend seems to cause a TDR on
Intel SandyBridge. Presumeably this is because the ClearView is
implemented as a regular draw and the driver doesn't properly set up the
state.
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 3885ee272685941f6dfb6cd941d550b107f033d2
Author: Jeff Gilbert <jgilbert@mozilla.com>
Date: Wed Jan 22 18:42:56 2020 -0800

19
gfx/angle/targets/angle_common/moz.build
View File

@ -4,18 +4,13 @@ include('../../moz.build.common')
#DEFINES['ANGLE_IS_64_BIT_CPU'] = True
#DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
#DEFINES['CHROMIUM_BUILD'] = True
DEFINES['CR_CLANG_REVISION'] = '"357692-1"'
DEFINES['CR_CLANG_REVISION'] = '"n332890-c2443155-1"'
DEFINES['DYNAMIC_ANNOTATIONS_ENABLED'] = '0'
#DEFINES['FULL_SAFE_BROWSING'] = True
#DEFINES['NDEBUG'] = True
DEFINES['NOMINMAX'] = True
#DEFINES['NO_TCMALLOC'] = True
DEFINES['NTDDI_VERSION'] = 'NTDDI_WIN10_RS2'
#DEFINES['NVALGRIND'] = True
#DEFINES['PSAPI_VERSION'] = '2'
#DEFINES['SAFE_BROWSING_CSD'] = True
#DEFINES['SAFE_BROWSING_DB_LOCAL'] = True
DEFINES['UNICODE'] = True
#DEFINES['USE_AURA'] = '1'
#DEFINES['WIN32'] = True
@ -51,7 +46,7 @@ LOCAL_INCLUDES += [
# '-fcrash-diagnostics-dir=../tools/clang/crashreports',
# '-fdebug-compilation-dir',
# '-fmerge-all-constants',
# '-fmsc-version=1911',
# '-fmsc-version=1916',
# '-fno-standalone-debug',
# '-gcodeview-ghash',
# '-instcombine-lower-dbg-declare=0',
@ -61,11 +56,17 @@ LOCAL_INCLUDES += [
# '-Wextra-semi',
# '-Wheader-hygiene',
# '-Wimplicit-fallthrough',
# '-Wno-bitwise-conditional-parentheses',
# '-Wno-builtin-assume-aligned-alignment',
# '-Wno-builtin-macro-redefined',
# '-Wno-c++11-narrowing',
# '-Wno-deprecated-copy',
# '-Wno-final-dtor-non-final-class',
# '-Wno-ignored-pragma-optimize',
# '-Wno-implicit-int-float-conversion',
# '-Wno-missing-field-initializers',
# '-Wno-nonportable-include-path',
# '-Wno-sizeof-array-div',
# '-Wno-undefined-var-template',
# '-Wno-unneeded-internal-declaration',
# '-Wno-unused-parameter',
@ -142,6 +143,7 @@ LOCAL_INCLUDES += [
# '/Z7',
# '/Zc:inline',
# '/Zc:sizedDealloc-',
# '/Zc:twoPhase',
#]
SOURCES += [
@ -193,13 +195,14 @@ if CONFIG['OS_ARCH'] not in ('Darwin', 'WINNT'):
# '/DEBUG:GHASH',
# '/FIXED:NO',
# '/INCREMENTAL:NO',
# '/lldignoreenv',
# '/OPT:ICF',
# '/OPT:NOLLDTAILMERGE',
# '/OPT:REF',
# '/pdbaltpath:%_PDB%',
# '/PDBSourcePath:C:/dev/angle/out',
# '/PROFILE',
# '/TIMESTAMP:1554613200',
# '/TIMESTAMP:1575176400',
# '/WX',
#]

19
gfx/angle/targets/angle_gpu_info_util/moz.build
View File

@ -6,18 +6,13 @@ DEFINES['ANGLE_ENABLE_D3D11'] = True
DEFINES['ANGLE_ENABLE_D3D9'] = True
#DEFINES['ANGLE_IS_64_BIT_CPU'] = True
#DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
#DEFINES['CHROMIUM_BUILD'] = True
DEFINES['CR_CLANG_REVISION'] = '"357692-1"'
DEFINES['CR_CLANG_REVISION'] = '"n332890-c2443155-1"'
DEFINES['DYNAMIC_ANNOTATIONS_ENABLED'] = '0'
#DEFINES['FULL_SAFE_BROWSING'] = True
#DEFINES['NDEBUG'] = True
DEFINES['NOMINMAX'] = True
#DEFINES['NO_TCMALLOC'] = True
DEFINES['NTDDI_VERSION'] = 'NTDDI_WIN10_RS2'
#DEFINES['NVALGRIND'] = True
#DEFINES['PSAPI_VERSION'] = '2'
#DEFINES['SAFE_BROWSING_CSD'] = True
#DEFINES['SAFE_BROWSING_DB_LOCAL'] = True
DEFINES['UNICODE'] = True
#DEFINES['USE_AURA'] = '1'
#DEFINES['WIN32'] = True
@ -53,7 +48,7 @@ LOCAL_INCLUDES += [
# '-fcrash-diagnostics-dir=../tools/clang/crashreports',
# '-fdebug-compilation-dir',
# '-fmerge-all-constants',
# '-fmsc-version=1911',
# '-fmsc-version=1916',
# '-fno-standalone-debug',
# '-gcodeview-ghash',
# '-instcombine-lower-dbg-declare=0',
@ -63,11 +58,17 @@ LOCAL_INCLUDES += [
# '-Wextra-semi',
# '-Wheader-hygiene',
# '-Wimplicit-fallthrough',
# '-Wno-bitwise-conditional-parentheses',
# '-Wno-builtin-assume-aligned-alignment',
# '-Wno-builtin-macro-redefined',
# '-Wno-c++11-narrowing',
# '-Wno-deprecated-copy',
# '-Wno-final-dtor-non-final-class',
# '-Wno-ignored-pragma-optimize',
# '-Wno-implicit-int-float-conversion',
# '-Wno-missing-field-initializers',
# '-Wno-nonportable-include-path',
# '-Wno-sizeof-array-div',
# '-Wno-undefined-var-template',
# '-Wno-unneeded-internal-declaration',
# '-Wno-unused-parameter',
@ -144,6 +145,7 @@ LOCAL_INCLUDES += [
# '/Z7',
# '/Zc:inline',
# '/Zc:sizedDealloc-',
# '/Zc:twoPhase',
#]
SOURCES += [
@ -173,13 +175,14 @@ OS_LIBS += [
# '/DEBUG:GHASH',
# '/FIXED:NO',
# '/INCREMENTAL:NO',
# '/lldignoreenv',
# '/OPT:ICF',
# '/OPT:NOLLDTAILMERGE',
# '/OPT:REF',
# '/pdbaltpath:%_PDB%',
# '/PDBSourcePath:C:/dev/angle/out',
# '/PROFILE',
# '/TIMESTAMP:1554613200',
# '/TIMESTAMP:1575176400',
# '/WX',
#]

19
gfx/angle/targets/angle_image_util/moz.build
View File

@ -4,18 +4,13 @@ include('../../moz.build.common')
#DEFINES['ANGLE_IS_64_BIT_CPU'] = True
#DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
#DEFINES['CHROMIUM_BUILD'] = True
DEFINES['CR_CLANG_REVISION'] = '"357692-1"'
DEFINES['CR_CLANG_REVISION'] = '"n332890-c2443155-1"'
DEFINES['DYNAMIC_ANNOTATIONS_ENABLED'] = '0'
#DEFINES['FULL_SAFE_BROWSING'] = True
#DEFINES['NDEBUG'] = True
DEFINES['NOMINMAX'] = True
#DEFINES['NO_TCMALLOC'] = True
DEFINES['NTDDI_VERSION'] = 'NTDDI_WIN10_RS2'
#DEFINES['NVALGRIND'] = True
#DEFINES['PSAPI_VERSION'] = '2'
#DEFINES['SAFE_BROWSING_CSD'] = True
#DEFINES['SAFE_BROWSING_DB_LOCAL'] = True
DEFINES['UNICODE'] = True
#DEFINES['USE_AURA'] = '1'
#DEFINES['WIN32'] = True
@ -51,7 +46,7 @@ LOCAL_INCLUDES += [
# '-fcrash-diagnostics-dir=../tools/clang/crashreports',
# '-fdebug-compilation-dir',
# '-fmerge-all-constants',
# '-fmsc-version=1911',
# '-fmsc-version=1916',
# '-fno-standalone-debug',
# '-gcodeview-ghash',
# '-instcombine-lower-dbg-declare=0',
@ -61,11 +56,17 @@ LOCAL_INCLUDES += [
# '-Wextra-semi',
# '-Wheader-hygiene',
# '-Wimplicit-fallthrough',
# '-Wno-bitwise-conditional-parentheses',
# '-Wno-builtin-assume-aligned-alignment',
# '-Wno-builtin-macro-redefined',
# '-Wno-c++11-narrowing',
# '-Wno-deprecated-copy',
# '-Wno-final-dtor-non-final-class',
# '-Wno-ignored-pragma-optimize',
# '-Wno-implicit-int-float-conversion',
# '-Wno-missing-field-initializers',
# '-Wno-nonportable-include-path',
# '-Wno-sizeof-array-div',
# '-Wno-undefined-var-template',
# '-Wno-unneeded-internal-declaration',
# '-Wno-unused-parameter',
@ -142,6 +143,7 @@ LOCAL_INCLUDES += [
# '/Z7',
# '/Zc:inline',
# '/Zc:sizedDealloc-',
# '/Zc:twoPhase',
#]
SOURCES += [
@ -164,13 +166,14 @@ DIRS += [
# '/DEBUG:GHASH',
# '/FIXED:NO',
# '/INCREMENTAL:NO',
# '/lldignoreenv',
# '/OPT:ICF',
# '/OPT:NOLLDTAILMERGE',
# '/OPT:REF',
# '/pdbaltpath:%_PDB%',
# '/PDBSourcePath:C:/dev/angle/out',
# '/PROFILE',
# '/TIMESTAMP:1554613200',
# '/TIMESTAMP:1575176400',
# '/WX',
#]

19
gfx/angle/targets/libEGL/moz.build
View File

@ -7,24 +7,19 @@ DEFINES['ANGLE_GLESV2_LIBRARY_NAME'] = '"libGLESv2"'
#DEFINES['ANGLE_IS_64_BIT_CPU'] = True
DEFINES['ANGLE_USE_EGL_LOADER'] = True
#DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
#DEFINES['CHROMIUM_BUILD'] = True
DEFINES['CR_CLANG_REVISION'] = '"357692-1"'
DEFINES['CR_CLANG_REVISION'] = '"n332890-c2443155-1"'
DEFINES['DYNAMIC_ANNOTATIONS_ENABLED'] = '0'
DEFINES['EGLAPI'] = ''
DEFINES['EGL_EGLEXT_PROTOTYPES'] = True
DEFINES['EGL_EGL_PROTOTYPES'] = '1'
#DEFINES['FULL_SAFE_BROWSING'] = True
DEFINES['GL_GLES_PROTOTYPES'] = '1'
DEFINES['GL_GLEXT_PROTOTYPES'] = True
DEFINES['LIBEGL_IMPLEMENTATION'] = True
#DEFINES['NDEBUG'] = True
DEFINES['NOMINMAX'] = True
#DEFINES['NO_TCMALLOC'] = True
DEFINES['NTDDI_VERSION'] = 'NTDDI_WIN10_RS2'
#DEFINES['NVALGRIND'] = True
#DEFINES['PSAPI_VERSION'] = '2'
#DEFINES['SAFE_BROWSING_CSD'] = True
#DEFINES['SAFE_BROWSING_DB_LOCAL'] = True
DEFINES['UNICODE'] = True
#DEFINES['USE_AURA'] = '1'
#DEFINES['WIN32'] = True
@ -59,7 +54,7 @@ LOCAL_INCLUDES += [
# '-fcrash-diagnostics-dir=../tools/clang/crashreports',
# '-fdebug-compilation-dir',
# '-fmerge-all-constants',
# '-fmsc-version=1911',
# '-fmsc-version=1916',
# '-fno-standalone-debug',
# '-gcodeview-ghash',
# '-instcombine-lower-dbg-declare=0',
@ -69,11 +64,17 @@ LOCAL_INCLUDES += [
# '-Wextra-semi',
# '-Wheader-hygiene',
# '-Wimplicit-fallthrough',
# '-Wno-bitwise-conditional-parentheses',
# '-Wno-builtin-assume-aligned-alignment',
# '-Wno-builtin-macro-redefined',
# '-Wno-c++11-narrowing',
# '-Wno-deprecated-copy',
# '-Wno-final-dtor-non-final-class',
# '-Wno-ignored-pragma-optimize',
# '-Wno-implicit-int-float-conversion',
# '-Wno-missing-field-initializers',
# '-Wno-nonportable-include-path',
# '-Wno-sizeof-array-div',
# '-Wno-undefined-var-template',
# '-Wno-unneeded-internal-declaration',
# '-Wno-unused-parameter',
@ -150,6 +151,7 @@ LOCAL_INCLUDES += [
# '/Z7',
# '/Zc:inline',
# '/Zc:sizedDealloc-',
# '/Zc:twoPhase',
#]
SOURCES += [
@ -204,6 +206,7 @@ OS_LIBS += [
# '/ignore:4199',
# '/ignore:4221',
# '/INCREMENTAL:NO',
# '/lldignoreenv',
# '/MACHINE:X64',
# '/NXCOMPAT',
# '/OPT:ICF',
@ -213,7 +216,7 @@ OS_LIBS += [
# '/PDBSourcePath:C:/dev/angle/out',
# '/PROFILE',
# '/SUBSYSTEM:CONSOLE,5.02',
# '/TIMESTAMP:1554613200',
# '/TIMESTAMP:1575176400',
# '/WX',
#]

19
gfx/angle/targets/libGLESv2/moz.build
View File

@ -7,12 +7,10 @@ DEFINES['ANGLE_ENABLE_D3D11'] = True
DEFINES['ANGLE_ENABLE_D3D9'] = True
#DEFINES['ANGLE_IS_64_BIT_CPU'] = True
#DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
#DEFINES['CHROMIUM_BUILD'] = True
DEFINES['CR_CLANG_REVISION'] = '"357692-1"'
DEFINES['CR_CLANG_REVISION'] = '"n332890-c2443155-1"'
DEFINES['DYNAMIC_ANNOTATIONS_ENABLED'] = '0'
DEFINES['EGL_EGLEXT_PROTOTYPES'] = True
DEFINES['EGL_EGL_PROTOTYPES'] = '1'
#DEFINES['FULL_SAFE_BROWSING'] = True
DEFINES['GL_API'] = ''
DEFINES['GL_APICALL'] = ''
DEFINES['GL_GLES_PROTOTYPES'] = '1'
@ -21,12 +19,9 @@ DEFINES['LIBANGLE_IMPLEMENTATION'] = True
DEFINES['LIBGLESV2_IMPLEMENTATION'] = True
#DEFINES['NDEBUG'] = True
DEFINES['NOMINMAX'] = True
#DEFINES['NO_TCMALLOC'] = True
DEFINES['NTDDI_VERSION'] = 'NTDDI_WIN10_RS2'
#DEFINES['NVALGRIND'] = True
#DEFINES['PSAPI_VERSION'] = '2'
#DEFINES['SAFE_BROWSING_CSD'] = True
#DEFINES['SAFE_BROWSING_DB_LOCAL'] = True
DEFINES['UNICODE'] = True
#DEFINES['USE_AURA'] = '1'
#DEFINES['WIN32'] = True
@ -62,7 +57,7 @@ LOCAL_INCLUDES += [
# '-fcrash-diagnostics-dir=../tools/clang/crashreports',
# '-fdebug-compilation-dir',
# '-fmerge-all-constants',
# '-fmsc-version=1911',
# '-fmsc-version=1916',
# '-fno-standalone-debug',
# '-gcodeview-ghash',
# '-instcombine-lower-dbg-declare=0',
@ -72,11 +67,17 @@ LOCAL_INCLUDES += [
# '-Wextra-semi',
# '-Wheader-hygiene',
# '-Wimplicit-fallthrough',
# '-Wno-bitwise-conditional-parentheses',
# '-Wno-builtin-assume-aligned-alignment',
# '-Wno-builtin-macro-redefined',
# '-Wno-c++11-narrowing',
# '-Wno-deprecated-copy',
# '-Wno-final-dtor-non-final-class',
# '-Wno-ignored-pragma-optimize',
# '-Wno-implicit-int-float-conversion',
# '-Wno-missing-field-initializers',
# '-Wno-nonportable-include-path',
# '-Wno-sizeof-array-div',
# '-Wno-undefined-var-template',
# '-Wno-unneeded-internal-declaration',
# '-Wno-unused-parameter',
@ -154,6 +155,7 @@ LOCAL_INCLUDES += [
# '/Z7',
# '/Zc:inline',
# '/Zc:sizedDealloc-',
# '/Zc:twoPhase',
#]
SOURCES += [
@ -395,6 +397,7 @@ OS_LIBS += [
# '/ignore:4199',
# '/ignore:4221',
# '/INCREMENTAL:NO',
# '/lldignoreenv',
# '/MACHINE:X64',
# '/NXCOMPAT',
# '/OPT:ICF',
@ -404,7 +407,7 @@ OS_LIBS += [
# '/PDBSourcePath:C:/dev/angle/out',
# '/PROFILE',
# '/SUBSYSTEM:CONSOLE,5.02',
# '/TIMESTAMP:1554613200',
# '/TIMESTAMP:1575176400',
# '/WX',
#]

19
gfx/angle/targets/preprocessor/moz.build
View File

@ -4,18 +4,13 @@ include('../../moz.build.common')
#DEFINES['ANGLE_IS_64_BIT_CPU'] = True
#DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
#DEFINES['CHROMIUM_BUILD'] = True
DEFINES['CR_CLANG_REVISION'] = '"357692-1"'
DEFINES['CR_CLANG_REVISION'] = '"n332890-c2443155-1"'
DEFINES['DYNAMIC_ANNOTATIONS_ENABLED'] = '0'
#DEFINES['FULL_SAFE_BROWSING'] = True
#DEFINES['NDEBUG'] = True
DEFINES['NOMINMAX'] = True
#DEFINES['NO_TCMALLOC'] = True
DEFINES['NTDDI_VERSION'] = 'NTDDI_WIN10_RS2'
#DEFINES['NVALGRIND'] = True
#DEFINES['PSAPI_VERSION'] = '2'
#DEFINES['SAFE_BROWSING_CSD'] = True
#DEFINES['SAFE_BROWSING_DB_LOCAL'] = True
DEFINES['UNICODE'] = True
#DEFINES['USE_AURA'] = '1'
#DEFINES['WIN32'] = True
@ -51,7 +46,7 @@ LOCAL_INCLUDES += [
# '-fcrash-diagnostics-dir=../tools/clang/crashreports',
# '-fdebug-compilation-dir',
# '-fmerge-all-constants',
# '-fmsc-version=1911',
# '-fmsc-version=1916',
# '-fno-standalone-debug',
# '-gcodeview-ghash',
# '-instcombine-lower-dbg-declare=0',
@ -61,11 +56,17 @@ LOCAL_INCLUDES += [
# '-Wextra-semi',
# '-Wheader-hygiene',
# '-Wimplicit-fallthrough',
# '-Wno-bitwise-conditional-parentheses',
# '-Wno-builtin-assume-aligned-alignment',
# '-Wno-builtin-macro-redefined',
# '-Wno-c++11-narrowing',
# '-Wno-deprecated-copy',
# '-Wno-final-dtor-non-final-class',
# '-Wno-ignored-pragma-optimize',
# '-Wno-implicit-int-float-conversion',
# '-Wno-missing-field-initializers',
# '-Wno-nonportable-include-path',
# '-Wno-sizeof-array-div',
# '-Wno-undefined-var-template',
# '-Wno-unneeded-internal-declaration',
# '-Wno-unused-parameter',
@ -142,6 +143,7 @@ LOCAL_INCLUDES += [
# '/Z7',
# '/Zc:inline',
# '/Zc:sizedDealloc-',
# '/Zc:twoPhase',
#]
SOURCES += [
@ -171,13 +173,14 @@ DIRS += [
# '/DEBUG:GHASH',
# '/FIXED:NO',
# '/INCREMENTAL:NO',
# '/lldignoreenv',
# '/OPT:ICF',
# '/OPT:NOLLDTAILMERGE',
# '/OPT:REF',
# '/pdbaltpath:%_PDB%',
# '/PDBSourcePath:C:/dev/angle/out',
# '/PROFILE',
# '/TIMESTAMP:1554613200',
# '/TIMESTAMP:1575176400',
# '/WX',
#]

19
gfx/angle/targets/translator/moz.build
View File

@ -7,18 +7,13 @@ DEFINES['ANGLE_ENABLE_GLSL'] = True
DEFINES['ANGLE_ENABLE_HLSL'] = True
#DEFINES['ANGLE_IS_64_BIT_CPU'] = True
#DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
#DEFINES['CHROMIUM_BUILD'] = True
DEFINES['CR_CLANG_REVISION'] = '"357692-1"'
DEFINES['CR_CLANG_REVISION'] = '"n332890-c2443155-1"'
DEFINES['DYNAMIC_ANNOTATIONS_ENABLED'] = '0'
#DEFINES['FULL_SAFE_BROWSING'] = True
#DEFINES['NDEBUG'] = True
DEFINES['NOMINMAX'] = True
#DEFINES['NO_TCMALLOC'] = True
DEFINES['NTDDI_VERSION'] = 'NTDDI_WIN10_RS2'
#DEFINES['NVALGRIND'] = True
#DEFINES['PSAPI_VERSION'] = '2'
#DEFINES['SAFE_BROWSING_CSD'] = True
#DEFINES['SAFE_BROWSING_DB_LOCAL'] = True
DEFINES['UNICODE'] = True
#DEFINES['USE_AURA'] = '1'
#DEFINES['WIN32'] = True
@ -54,7 +49,7 @@ LOCAL_INCLUDES += [
# '-fcrash-diagnostics-dir=../tools/clang/crashreports',
# '-fdebug-compilation-dir',
# '-fmerge-all-constants',
# '-fmsc-version=1911',
# '-fmsc-version=1916',
# '-fno-standalone-debug',
# '-gcodeview-ghash',
# '-instcombine-lower-dbg-declare=0',
@ -64,11 +59,17 @@ LOCAL_INCLUDES += [
# '-Wextra-semi',
# '-Wheader-hygiene',
# '-Wimplicit-fallthrough',
# '-Wno-bitwise-conditional-parentheses',
# '-Wno-builtin-assume-aligned-alignment',
# '-Wno-builtin-macro-redefined',
# '-Wno-c++11-narrowing',
# '-Wno-deprecated-copy',
# '-Wno-final-dtor-non-final-class',
# '-Wno-ignored-pragma-optimize',
# '-Wno-implicit-int-float-conversion',
# '-Wno-missing-field-initializers',
# '-Wno-nonportable-include-path',
# '-Wno-sizeof-array-div',
# '-Wno-undefined-var-template',
# '-Wno-unneeded-internal-declaration',
# '-Wno-unused-parameter',
@ -146,6 +147,7 @@ LOCAL_INCLUDES += [
# '/Z7',
# '/Zc:inline',
# '/Zc:sizedDealloc-',
# '/Zc:twoPhase',
#]
SOURCES += [
@ -290,13 +292,14 @@ DIRS += [
# '/DEBUG:GHASH',
# '/FIXED:NO',
# '/INCREMENTAL:NO',
# '/lldignoreenv',
# '/OPT:ICF',
# '/OPT:NOLLDTAILMERGE',
# '/OPT:REF',
# '/pdbaltpath:%_PDB%',
# '/PDBSourcePath:C:/dev/angle/out',
# '/PROFILE',
# '/TIMESTAMP:1554613200',
# '/TIMESTAMP:1575176400',
# '/WX',
#]