mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge mozilla-central to autoland a=merge on a CLOSED TREE

This commit is contained in:
Coroiu Cristina 2020-05-07 19:47:01 +03:00
Родитель bdddaad896 6d5c256c38
Коммит 58cc847a1c
14 изменённых файлов: 60 добавлений и 141 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
gfx/angle/checkout/include/platform/FeaturesD3D.h
Просмотреть файл

@ -155,14 +155,6 @@ 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
Просмотреть файл

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

29
gfx/angle/checkout/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
Просмотреть файл

@ -505,34 +505,7 @@ angle::Result Clear11::clearFramebuffer(const gl::Context *context,
const auto &framebufferRTV = renderTarget->getRenderTargetView();
ASSERT(framebufferRTV.valid());
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);
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) ||
if ((!(mRenderer->getRenderer11DeviceCaps().supportsClearView) && 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
Просмотреть файл

@ -2435,9 +2435,7 @@ 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
Просмотреть файл

@ -22,9 +22,6 @@ 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};
@ -95,11 +92,6 @@ 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
Просмотреть файл

@ -94,7 +94,6 @@ 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);

14
gfx/angle/cherry_picks.txt
Просмотреть файл

@ -1,17 +1,3 @@
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
Просмотреть файл

@ -4,13 +4,18 @@ include('../../moz.build.common')
#DEFINES['ANGLE_IS_64_BIT_CPU'] = True
#DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
DEFINES['CR_CLANG_REVISION'] = '"n332890-c2443155-1"'
#DEFINES['CHROMIUM_BUILD'] = True
DEFINES['CR_CLANG_REVISION'] = '"357692-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
@ -46,7 +51,7 @@ LOCAL_INCLUDES += [
# '-fcrash-diagnostics-dir=../tools/clang/crashreports',
# '-fdebug-compilation-dir',
# '-fmerge-all-constants',
# '-fmsc-version=1916',
# '-fmsc-version=1911',
# '-fno-standalone-debug',
# '-gcodeview-ghash',
# '-instcombine-lower-dbg-declare=0',
@ -56,17 +61,11 @@ 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',
@ -143,7 +142,6 @@ LOCAL_INCLUDES += [
# '/Z7',
# '/Zc:inline',
# '/Zc:sizedDealloc-',
# '/Zc:twoPhase',
#]
SOURCES += [
@ -195,14 +193,13 @@ 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:1575176400',
# '/TIMESTAMP:1554613200',
# '/WX',
#]

19
gfx/angle/targets/angle_gpu_info_util/moz.build
Просмотреть файл

@ -6,13 +6,18 @@ 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['CR_CLANG_REVISION'] = '"n332890-c2443155-1"'
#DEFINES['CHROMIUM_BUILD'] = True
DEFINES['CR_CLANG_REVISION'] = '"357692-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
@ -48,7 +53,7 @@ LOCAL_INCLUDES += [
# '-fcrash-diagnostics-dir=../tools/clang/crashreports',
# '-fdebug-compilation-dir',
# '-fmerge-all-constants',
# '-fmsc-version=1916',
# '-fmsc-version=1911',
# '-fno-standalone-debug',
# '-gcodeview-ghash',
# '-instcombine-lower-dbg-declare=0',
@ -58,17 +63,11 @@ 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',
@ -145,7 +144,6 @@ LOCAL_INCLUDES += [
# '/Z7',
# '/Zc:inline',
# '/Zc:sizedDealloc-',
# '/Zc:twoPhase',
#]
SOURCES += [
@ -175,14 +173,13 @@ OS_LIBS += [
# '/DEBUG:GHASH',
# '/FIXED:NO',
# '/INCREMENTAL:NO',
# '/lldignoreenv',
# '/OPT:ICF',
# '/OPT:NOLLDTAILMERGE',
# '/OPT:REF',
# '/pdbaltpath:%_PDB%',
# '/PDBSourcePath:C:/dev/angle/out',
# '/PROFILE',
# '/TIMESTAMP:1575176400',
# '/TIMESTAMP:1554613200',
# '/WX',
#]

19
gfx/angle/targets/angle_image_util/moz.build
Просмотреть файл

@ -4,13 +4,18 @@ include('../../moz.build.common')
#DEFINES['ANGLE_IS_64_BIT_CPU'] = True
#DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
DEFINES['CR_CLANG_REVISION'] = '"n332890-c2443155-1"'
#DEFINES['CHROMIUM_BUILD'] = True
DEFINES['CR_CLANG_REVISION'] = '"357692-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
@ -46,7 +51,7 @@ LOCAL_INCLUDES += [
# '-fcrash-diagnostics-dir=../tools/clang/crashreports',
# '-fdebug-compilation-dir',
# '-fmerge-all-constants',
# '-fmsc-version=1916',
# '-fmsc-version=1911',
# '-fno-standalone-debug',
# '-gcodeview-ghash',
# '-instcombine-lower-dbg-declare=0',
@ -56,17 +61,11 @@ 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',
@ -143,7 +142,6 @@ LOCAL_INCLUDES += [
# '/Z7',
# '/Zc:inline',
# '/Zc:sizedDealloc-',
# '/Zc:twoPhase',
#]
SOURCES += [
@ -166,14 +164,13 @@ DIRS += [
# '/DEBUG:GHASH',
# '/FIXED:NO',
# '/INCREMENTAL:NO',
# '/lldignoreenv',
# '/OPT:ICF',
# '/OPT:NOLLDTAILMERGE',
# '/OPT:REF',
# '/pdbaltpath:%_PDB%',
# '/PDBSourcePath:C:/dev/angle/out',
# '/PROFILE',
# '/TIMESTAMP:1575176400',
# '/TIMESTAMP:1554613200',
# '/WX',
#]

19
gfx/angle/targets/libEGL/moz.build
Просмотреть файл

@ -7,19 +7,24 @@ 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['CR_CLANG_REVISION'] = '"n332890-c2443155-1"'
#DEFINES['CHROMIUM_BUILD'] = True
DEFINES['CR_CLANG_REVISION'] = '"357692-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
@ -54,7 +59,7 @@ LOCAL_INCLUDES += [
# '-fcrash-diagnostics-dir=../tools/clang/crashreports',
# '-fdebug-compilation-dir',
# '-fmerge-all-constants',
# '-fmsc-version=1916',
# '-fmsc-version=1911',
# '-fno-standalone-debug',
# '-gcodeview-ghash',
# '-instcombine-lower-dbg-declare=0',
@ -64,17 +69,11 @@ 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',
@ -151,7 +150,6 @@ LOCAL_INCLUDES += [
# '/Z7',
# '/Zc:inline',
# '/Zc:sizedDealloc-',
# '/Zc:twoPhase',
#]
SOURCES += [
@ -206,7 +204,6 @@ OS_LIBS += [
# '/ignore:4199',
# '/ignore:4221',
# '/INCREMENTAL:NO',
# '/lldignoreenv',
# '/MACHINE:X64',
# '/NXCOMPAT',
# '/OPT:ICF',
@ -216,7 +213,7 @@ OS_LIBS += [
# '/PDBSourcePath:C:/dev/angle/out',
# '/PROFILE',
# '/SUBSYSTEM:CONSOLE,5.02',
# '/TIMESTAMP:1575176400',
# '/TIMESTAMP:1554613200',
# '/WX',
#]

19
gfx/angle/targets/libGLESv2/moz.build
Просмотреть файл

@ -7,10 +7,12 @@ 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['CR_CLANG_REVISION'] = '"n332890-c2443155-1"'
#DEFINES['CHROMIUM_BUILD'] = True
DEFINES['CR_CLANG_REVISION'] = '"357692-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'
@ -19,9 +21,12 @@ 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
@ -57,7 +62,7 @@ LOCAL_INCLUDES += [
# '-fcrash-diagnostics-dir=../tools/clang/crashreports',
# '-fdebug-compilation-dir',
# '-fmerge-all-constants',
# '-fmsc-version=1916',
# '-fmsc-version=1911',
# '-fno-standalone-debug',
# '-gcodeview-ghash',
# '-instcombine-lower-dbg-declare=0',
@ -67,17 +72,11 @@ 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',
@ -155,7 +154,6 @@ LOCAL_INCLUDES += [
# '/Z7',
# '/Zc:inline',
# '/Zc:sizedDealloc-',
# '/Zc:twoPhase',
#]
SOURCES += [
@ -397,7 +395,6 @@ OS_LIBS += [
# '/ignore:4199',
# '/ignore:4221',
# '/INCREMENTAL:NO',
# '/lldignoreenv',
# '/MACHINE:X64',
# '/NXCOMPAT',
# '/OPT:ICF',
@ -407,7 +404,7 @@ OS_LIBS += [
# '/PDBSourcePath:C:/dev/angle/out',
# '/PROFILE',
# '/SUBSYSTEM:CONSOLE,5.02',
# '/TIMESTAMP:1575176400',
# '/TIMESTAMP:1554613200',
# '/WX',
#]

19
gfx/angle/targets/preprocessor/moz.build
Просмотреть файл

@ -4,13 +4,18 @@ include('../../moz.build.common')
#DEFINES['ANGLE_IS_64_BIT_CPU'] = True
#DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
DEFINES['CR_CLANG_REVISION'] = '"n332890-c2443155-1"'
#DEFINES['CHROMIUM_BUILD'] = True
DEFINES['CR_CLANG_REVISION'] = '"357692-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
@ -46,7 +51,7 @@ LOCAL_INCLUDES += [
# '-fcrash-diagnostics-dir=../tools/clang/crashreports',
# '-fdebug-compilation-dir',
# '-fmerge-all-constants',
# '-fmsc-version=1916',
# '-fmsc-version=1911',
# '-fno-standalone-debug',
# '-gcodeview-ghash',
# '-instcombine-lower-dbg-declare=0',
@ -56,17 +61,11 @@ 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',
@ -143,7 +142,6 @@ LOCAL_INCLUDES += [
# '/Z7',
# '/Zc:inline',
# '/Zc:sizedDealloc-',
# '/Zc:twoPhase',
#]
SOURCES += [
@ -173,14 +171,13 @@ DIRS += [
# '/DEBUG:GHASH',
# '/FIXED:NO',
# '/INCREMENTAL:NO',
# '/lldignoreenv',
# '/OPT:ICF',
# '/OPT:NOLLDTAILMERGE',
# '/OPT:REF',
# '/pdbaltpath:%_PDB%',
# '/PDBSourcePath:C:/dev/angle/out',
# '/PROFILE',
# '/TIMESTAMP:1575176400',
# '/TIMESTAMP:1554613200',
# '/WX',
#]

19
gfx/angle/targets/translator/moz.build
Просмотреть файл

@ -7,13 +7,18 @@ 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['CR_CLANG_REVISION'] = '"n332890-c2443155-1"'
#DEFINES['CHROMIUM_BUILD'] = True
DEFINES['CR_CLANG_REVISION'] = '"357692-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
@ -49,7 +54,7 @@ LOCAL_INCLUDES += [
# '-fcrash-diagnostics-dir=../tools/clang/crashreports',
# '-fdebug-compilation-dir',
# '-fmerge-all-constants',
# '-fmsc-version=1916',
# '-fmsc-version=1911',
# '-fno-standalone-debug',
# '-gcodeview-ghash',
# '-instcombine-lower-dbg-declare=0',
@ -59,17 +64,11 @@ 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',
@ -147,7 +146,6 @@ LOCAL_INCLUDES += [
# '/Z7',
# '/Zc:inline',
# '/Zc:sizedDealloc-',
# '/Zc:twoPhase',
#]
SOURCES += [
@ -292,14 +290,13 @@ DIRS += [
# '/DEBUG:GHASH',
# '/FIXED:NO',
# '/INCREMENTAL:NO',
# '/lldignoreenv',
# '/OPT:ICF',
# '/OPT:NOLLDTAILMERGE',
# '/OPT:REF',
# '/pdbaltpath:%_PDB%',
# '/PDBSourcePath:C:/dev/angle/out',
# '/PROFILE',
# '/TIMESTAMP:1575176400',
# '/TIMESTAMP:1554613200',
# '/WX',
#]