Bug 1517055 - Revendor ANGLE mozilla/firefox-66. (1xN texture cherry-pick) r=bholley
authorJeff Gilbert <jgilbert@mozilla.com>
Tue, 22 Jan 2019 11:45:51 -0800
changeset 514972 9474df714baf1145fe9cdb2ba8e659b4ac7a7404
parent 514971 8c488b723dc7a5ee007d3081b651d0b55e2b0883
child 514973 e310a6576d515656daf0598220d7fc579b96df97
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbholley
bugs1517055
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1517055 - Revendor ANGLE mozilla/firefox-66. (1xN texture cherry-pick) r=bholley Differential Revision: https://phabricator.services.mozilla.com/D17295
gfx/angle/checkout/out/gen/angle/id/commit.h
gfx/angle/checkout/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp
gfx/angle/cherry_picks.txt
gfx/angle/targets/angle_common/moz.build
gfx/angle/targets/angle_gpu_info_util/moz.build
gfx/angle/targets/angle_image_util/moz.build
gfx/angle/targets/libANGLE/moz.build
gfx/angle/targets/libEGL/moz.build
gfx/angle/targets/libGLESv2/moz.build
gfx/angle/targets/preprocessor/moz.build
gfx/angle/targets/translator/moz.build
--- a/gfx/angle/checkout/out/gen/angle/id/commit.h
+++ b/gfx/angle/checkout/out/gen/angle/id/commit.h
@@ -1,3 +1,3 @@
-#define ANGLE_COMMIT_HASH "790e8e6b4179"
+#define ANGLE_COMMIT_HASH "eff6bfdb1db9"
 #define ANGLE_COMMIT_HASH_SIZE 12
-#define ANGLE_COMMIT_DATE "2018-10-09 17:41:46 -0700"
+#define ANGLE_COMMIT_DATE "2019-01-22 11:11:06 -0800"
--- a/gfx/angle/checkout/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp
+++ b/gfx/angle/checkout/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp
@@ -119,18 +119,18 @@ angle::Result PixelTransfer11::loadResou
     return angle::Result::Continue();
 }
 
 void PixelTransfer11::setBufferToTextureCopyParams(const gl::Box &destArea, const gl::Extents &destSize, GLenum internalFormat,
                                                    const gl::PixelUnpackState &unpack, unsigned int offset, CopyShaderParams *parametersOut)
 {
     StructZero(parametersOut);
 
-    float texelCenterX = 0.5f / static_cast<float>(destSize.width - 1);
-    float texelCenterY = 0.5f / static_cast<float>(destSize.height - 1);
+    float texelCenterX = 0.5f / static_cast<float>(destSize.width);
+    float texelCenterY = 0.5f / static_cast<float>(destSize.height);
 
     unsigned int bytesPerPixel   = gl::GetSizedInternalFormatInfo(internalFormat).pixelBytes;
     unsigned int alignmentBytes = static_cast<unsigned int>(unpack.alignment);
     unsigned int alignmentPixels = (alignmentBytes <= bytesPerPixel ? 1 : alignmentBytes / bytesPerPixel);
 
     parametersOut->FirstPixelOffset     = offset / bytesPerPixel;
     parametersOut->PixelsPerRow         = static_cast<unsigned int>((unpack.rowLength > 0) ? unpack.rowLength : destArea.width);
     parametersOut->RowStride            = roundUp(parametersOut->PixelsPerRow, alignmentPixels);
--- a/gfx/angle/cherry_picks.txt
+++ b/gfx/angle/cherry_picks.txt
@@ -1,8 +1,20 @@
+commit eff6bfdb1db99505122a37f2911bdd3b845e19b8
+Author: Jeff Gilbert <jgilbert@mozilla.com>
+Date:   Thu Jan 3 23:38:44 2019 -0800
+
+    In PixelTransfer11, center offset should be 1/size, not 1/(size-1).
+    
+    Bug: angleproject:3039
+    Change-Id: Ie97bfb5aa3cfe7cd2c4b1d22b5b4a8d82a5e5170
+    Reviewed-on: https://chromium-review.googlesource.com/c/1407251
+    Reviewed-by: Jamie Madill <jmadill@chromium.org>
+    Commit-Queue: Jamie Madill <jmadill@chromium.org>
+
 commit 790e8e6b417905eca335d06c16ec54c977188110
 Author: Olli Etuaho <oetuaho@nvidia.com>
 Date:   Thu Sep 20 13:20:50 2018 +0300
 
     Fix using a large vertex attrib divisor on D3D11
     
     A divisor >= 256 used to trigger an assert on the D3D11 backend since
     it couldn't fit into the input layout cache. Increase the space
--- a/gfx/angle/targets/angle_common/moz.build
+++ b/gfx/angle/targets/angle_common/moz.build
@@ -26,16 +26,17 @@ DEFINES['UNICODE'] = True
 #DEFINES['WINAPI_FAMILY'] = 'WINAPI_FAMILY_DESKTOP_APP'
 #DEFINES['WINVER'] = '0x0A00'
 #DEFINES['WTF_USE_DYNAMIC_ANNOTATIONS'] = '1'
 DEFINES['_ATL_NO_OPENGL'] = True
 DEFINES['_CRT_RAND_S'] = True
 DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
 #DEFINES['_DEBUG'] = True
 DEFINES['_HAS_EXCEPTIONS'] = '0'
+#DEFINES['_HAS_ITERATOR_DEBUGGING'] = '0'
 DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
 DEFINES['_SECURE_ATL'] = True
 DEFINES['_UNICODE'] = True
 #DEFINES['_USING_V110_SDK71_'] = True
 #DEFINES['_WIN32_WINNT'] = '0x0A00'
 #DEFINES['_WINDOWS'] = True
 #DEFINES['__STD_C'] = True
 
@@ -62,36 +63,49 @@ LOCAL_INCLUDES += [
 #    '/TP',
 #    '/utf-8',
 #    '/W4',
 #    '/wd4091',
 #    '/wd4100',
 #    '/wd4117',
 #    '/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',
 #    '/we4456',
 #    '/we4458',
 #    '/we4800',
 #    '/we4838',
@@ -132,12 +146,13 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 
 if CONFIG['OS_ARCH'] not in ('Darwin', 'WINNT'):
     SOURCES += [
         '../../checkout/src/common/system_utils_linux.cpp',
     ]
 
 #LDFLAGS += [
 #    '/DEBUG',
+#    '/pdbaltpath:%_PDB%',
 #    '/WX',
 #]
 
 Library('angle_common')
--- a/gfx/angle/targets/angle_gpu_info_util/moz.build
+++ b/gfx/angle/targets/angle_gpu_info_util/moz.build
@@ -26,16 +26,17 @@ DEFINES['UNICODE'] = True
 #DEFINES['WINAPI_FAMILY'] = 'WINAPI_FAMILY_DESKTOP_APP'
 #DEFINES['WINVER'] = '0x0A00'
 #DEFINES['WTF_USE_DYNAMIC_ANNOTATIONS'] = '1'
 DEFINES['_ATL_NO_OPENGL'] = True
 DEFINES['_CRT_RAND_S'] = True
 DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
 #DEFINES['_DEBUG'] = True
 DEFINES['_HAS_EXCEPTIONS'] = '0'
+#DEFINES['_HAS_ITERATOR_DEBUGGING'] = '0'
 DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
 DEFINES['_SECURE_ATL'] = True
 DEFINES['_UNICODE'] = True
 #DEFINES['_USING_V110_SDK71_'] = True
 #DEFINES['_WIN32_WINNT'] = '0x0A00'
 #DEFINES['_WINDOWS'] = True
 #DEFINES['__STD_C'] = True
 
@@ -62,36 +63,49 @@ LOCAL_INCLUDES += [
 #    '/TP',
 #    '/utf-8',
 #    '/W4',
 #    '/wd4091',
 #    '/wd4100',
 #    '/wd4117',
 #    '/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',
 #    '/we4456',
 #    '/we4458',
 #    '/we4800',
 #    '/we4838',
@@ -118,12 +132,13 @@ DIRS += [
 ]
 
 OS_LIBS += [
     'setupapi',
 ]
 
 #LDFLAGS += [
 #    '/DEBUG',
+#    '/pdbaltpath:%_PDB%',
 #    '/WX',
 #]
 
 Library('angle_gpu_info_util')
--- a/gfx/angle/targets/angle_image_util/moz.build
+++ b/gfx/angle/targets/angle_image_util/moz.build
@@ -25,16 +25,17 @@ DEFINES['UNICODE'] = True
 #DEFINES['WINAPI_FAMILY'] = 'WINAPI_FAMILY_DESKTOP_APP'
 #DEFINES['WINVER'] = '0x0A00'
 #DEFINES['WTF_USE_DYNAMIC_ANNOTATIONS'] = '1'
 DEFINES['_ATL_NO_OPENGL'] = True
 DEFINES['_CRT_RAND_S'] = True
 DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
 #DEFINES['_DEBUG'] = True
 DEFINES['_HAS_EXCEPTIONS'] = '0'
+#DEFINES['_HAS_ITERATOR_DEBUGGING'] = '0'
 DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
 DEFINES['_SECURE_ATL'] = True
 DEFINES['_UNICODE'] = True
 #DEFINES['_USING_V110_SDK71_'] = True
 #DEFINES['_WIN32_WINNT'] = '0x0A00'
 #DEFINES['_WINDOWS'] = True
 #DEFINES['__STD_C'] = True
 
@@ -61,36 +62,49 @@ LOCAL_INCLUDES += [
 #    '/TP',
 #    '/utf-8',
 #    '/W4',
 #    '/wd4091',
 #    '/wd4100',
 #    '/wd4117',
 #    '/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',
 #    '/we4456',
 #    '/we4458',
 #    '/we4800',
 #    '/we4838',
@@ -111,12 +125,13 @@ USE_LIBS += [
 ]
 
 DIRS += [
     '../angle_common',
 ]
 
 #LDFLAGS += [
 #    '/DEBUG',
+#    '/pdbaltpath:%_PDB%',
 #    '/WX',
 #]
 
 Library('angle_image_util')
--- a/gfx/angle/targets/libANGLE/moz.build
+++ b/gfx/angle/targets/libANGLE/moz.build
@@ -31,16 +31,17 @@ DEFINES['UNICODE'] = True
 #DEFINES['WINAPI_FAMILY'] = 'WINAPI_FAMILY_DESKTOP_APP'
 #DEFINES['WINVER'] = '0x0A00'
 #DEFINES['WTF_USE_DYNAMIC_ANNOTATIONS'] = '1'
 DEFINES['_ATL_NO_OPENGL'] = True
 DEFINES['_CRT_RAND_S'] = True
 DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
 #DEFINES['_DEBUG'] = True
 DEFINES['_HAS_EXCEPTIONS'] = '0'
+#DEFINES['_HAS_ITERATOR_DEBUGGING'] = '0'
 DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
 DEFINES['_SECURE_ATL'] = True
 DEFINES['_UNICODE'] = True
 #DEFINES['_USING_V110_SDK71_'] = True
 #DEFINES['_WIN32_WINNT'] = '0x0A00'
 #DEFINES['_WINDOWS'] = True
 #DEFINES['__STD_C'] = True
 
@@ -67,37 +68,50 @@ LOCAL_INCLUDES += [
 #    '/TP',
 #    '/utf-8',
 #    '/W4',
 #    '/wd4091',
 #    '/wd4100',
 #    '/wd4117',
 #    '/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',
 #    '/we4456',
 #    '/we4458',
 #    '/we4800',
 #    '/we4838',
@@ -273,12 +287,13 @@ DIRS += [
 OS_LIBS += [
     'd3d9',
     'dxguid',
     'setupapi',
 ]
 
 #LDFLAGS += [
 #    '/DEBUG',
+#    '/pdbaltpath:%_PDB%',
 #    '/WX',
 #]
 
 Library('libANGLE')
--- a/gfx/angle/targets/libEGL/moz.build
+++ b/gfx/angle/targets/libEGL/moz.build
@@ -28,16 +28,17 @@ DEFINES['UNICODE'] = True
 #DEFINES['WINAPI_FAMILY'] = 'WINAPI_FAMILY_DESKTOP_APP'
 #DEFINES['WINVER'] = '0x0A00'
 #DEFINES['WTF_USE_DYNAMIC_ANNOTATIONS'] = '1'
 DEFINES['_ATL_NO_OPENGL'] = True
 DEFINES['_CRT_RAND_S'] = True
 DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
 #DEFINES['_DEBUG'] = True
 DEFINES['_HAS_EXCEPTIONS'] = '0'
+#DEFINES['_HAS_ITERATOR_DEBUGGING'] = '0'
 DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
 DEFINES['_SECURE_ATL'] = True
 DEFINES['_UNICODE'] = True
 #DEFINES['_USING_V110_SDK71_'] = True
 #DEFINES['_WIN32_WINNT'] = '0x0A00'
 #DEFINES['_WINDOWS'] = True
 #DEFINES['__STD_C'] = True
 
@@ -63,36 +64,49 @@ LOCAL_INCLUDES += [
 #    '/TP',
 #    '/utf-8',
 #    '/W4',
 #    '/wd4091',
 #    '/wd4100',
 #    '/wd4117',
 #    '/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',
 #    '/we4456',
 #    '/we4458',
 #    '/we4800',
 #    '/we4838',
@@ -144,15 +158,16 @@ OS_LIBS += [
 #    '/DYNAMICBASE',
 #    '/fastfail',
 #    '/FIXED:NO',
 #    '/ignore:4199',
 #    '/ignore:4221',
 #    '/INCREMENTAL',
 #    '/MACHINE:X64',
 #    '/NXCOMPAT',
+#    '/pdbaltpath:%_PDB%',
 #    '/SUBSYSTEM:CONSOLE,5.02',
 #    '/WX',
 #]
 
 DEFFILE = '../../checkout/src/libEGL/libEGL.def'
 RCFILE = '../../checkout/src/libEGL/libEGL.rc'
 GeckoSharedLibrary('libEGL', linkage=None)
--- a/gfx/angle/targets/libGLESv2/moz.build
+++ b/gfx/angle/targets/libGLESv2/moz.build
@@ -32,16 +32,17 @@ DEFINES['UNICODE'] = True
 #DEFINES['WINAPI_FAMILY'] = 'WINAPI_FAMILY_DESKTOP_APP'
 #DEFINES['WINVER'] = '0x0A00'
 #DEFINES['WTF_USE_DYNAMIC_ANNOTATIONS'] = '1'
 DEFINES['_ATL_NO_OPENGL'] = True
 DEFINES['_CRT_RAND_S'] = True
 DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
 #DEFINES['_DEBUG'] = True
 DEFINES['_HAS_EXCEPTIONS'] = '0'
+#DEFINES['_HAS_ITERATOR_DEBUGGING'] = '0'
 DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
 DEFINES['_SECURE_ATL'] = True
 DEFINES['_UNICODE'] = True
 #DEFINES['_USING_V110_SDK71_'] = True
 #DEFINES['_WIN32_WINNT'] = '0x0A00'
 #DEFINES['_WINDOWS'] = True
 #DEFINES['__STD_C'] = True
 
@@ -68,37 +69,50 @@ LOCAL_INCLUDES += [
 #    '/TP',
 #    '/utf-8',
 #    '/W4',
 #    '/wd4091',
 #    '/wd4100',
 #    '/wd4117',
 #    '/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',
 #    '/we4456',
 #    '/we4458',
 #    '/we4800',
 #    '/we4838',
@@ -162,15 +176,16 @@ OS_LIBS += [
 #    '/DYNAMICBASE',
 #    '/fastfail',
 #    '/FIXED:NO',
 #    '/ignore:4199',
 #    '/ignore:4221',
 #    '/INCREMENTAL',
 #    '/MACHINE:X64',
 #    '/NXCOMPAT',
+#    '/pdbaltpath:%_PDB%',
 #    '/SUBSYSTEM:CONSOLE,5.02',
 #    '/WX',
 #]
 
 DEFFILE = '../../checkout/src/libGLESv2/libGLESv2_autogen.def'
 RCFILE = '../../checkout/src/libGLESv2/libGLESv2.rc'
 GeckoSharedLibrary('libGLESv2', linkage=None)
--- a/gfx/angle/targets/preprocessor/moz.build
+++ b/gfx/angle/targets/preprocessor/moz.build
@@ -25,16 +25,17 @@ DEFINES['UNICODE'] = True
 #DEFINES['WINAPI_FAMILY'] = 'WINAPI_FAMILY_DESKTOP_APP'
 #DEFINES['WINVER'] = '0x0A00'
 #DEFINES['WTF_USE_DYNAMIC_ANNOTATIONS'] = '1'
 DEFINES['_ATL_NO_OPENGL'] = True
 DEFINES['_CRT_RAND_S'] = True
 DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
 #DEFINES['_DEBUG'] = True
 DEFINES['_HAS_EXCEPTIONS'] = '0'
+#DEFINES['_HAS_ITERATOR_DEBUGGING'] = '0'
 DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
 DEFINES['_SECURE_ATL'] = True
 DEFINES['_UNICODE'] = True
 #DEFINES['_USING_V110_SDK71_'] = True
 #DEFINES['_WIN32_WINNT'] = '0x0A00'
 #DEFINES['_WINDOWS'] = True
 #DEFINES['__STD_C'] = True
 
@@ -61,36 +62,49 @@ LOCAL_INCLUDES += [
 #    '/TP',
 #    '/utf-8',
 #    '/W4',
 #    '/wd4091',
 #    '/wd4100',
 #    '/wd4117',
 #    '/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',
 #    '/we4456',
 #    '/we4458',
 #    '/we4800',
 #    '/we4838',
@@ -118,12 +132,13 @@ USE_LIBS += [
 ]
 
 DIRS += [
     '../angle_common',
 ]
 
 #LDFLAGS += [
 #    '/DEBUG',
+#    '/pdbaltpath:%_PDB%',
 #    '/WX',
 #]
 
 Library('preprocessor')
--- a/gfx/angle/targets/translator/moz.build
+++ b/gfx/angle/targets/translator/moz.build
@@ -28,16 +28,17 @@ DEFINES['UNICODE'] = True
 #DEFINES['WINAPI_FAMILY'] = 'WINAPI_FAMILY_DESKTOP_APP'
 #DEFINES['WINVER'] = '0x0A00'
 #DEFINES['WTF_USE_DYNAMIC_ANNOTATIONS'] = '1'
 DEFINES['_ATL_NO_OPENGL'] = True
 DEFINES['_CRT_RAND_S'] = True
 DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
 #DEFINES['_DEBUG'] = True
 DEFINES['_HAS_EXCEPTIONS'] = '0'
+#DEFINES['_HAS_ITERATOR_DEBUGGING'] = '0'
 DEFINES['_SCL_SECURE_NO_DEPRECATE'] = True
 DEFINES['_SECURE_ATL'] = True
 DEFINES['_UNICODE'] = True
 #DEFINES['_USING_V110_SDK71_'] = True
 #DEFINES['_WIN32_WINNT'] = '0x0A00'
 #DEFINES['_WINDOWS'] = True
 #DEFINES['__STD_C'] = True
 
@@ -64,36 +65,49 @@ LOCAL_INCLUDES += [
 #    '/TP',
 #    '/utf-8',
 #    '/W4',
 #    '/wd4091',
 #    '/wd4100',
 #    '/wd4117',
 #    '/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',
 #    '/we4456',
 #    '/we4458',
 #    '/we4800',
@@ -227,12 +241,13 @@ USE_LIBS += [
 
 DIRS += [
     '../angle_common',
     '../preprocessor',
 ]
 
 #LDFLAGS += [
 #    '/DEBUG',
+#    '/pdbaltpath:%_PDB%',
 #    '/WX',
 #]
 
 Library('translator')