Bug 1271784. Allow WARP WebGL on Windows 7 without SP 1. r=jgilbert, a=sylvestre
authorJeff Muizelaar <jmuizelaar@mozilla.com>
Tue, 31 May 2016 13:38:34 -0400
changeset 333190 9eebb2835273857468a80e0e89013673352a37e7
parent 333189 c376a953a79220ff0d026583dd3a3dbb7b77b999
child 333191 b33098abf6244607dc6207b785788f05f2d4ed42
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert, sylvestre
bugs1271784
milestone48.0a2
Bug 1271784. Allow WARP WebGL on Windows 7 without SP 1. r=jgilbert, a=sylvestre ANGLE doesn't allow WARP on DXGI < 1.2 by default, but it will work fine for us.
dom/canvas/test/webgl-mochitest.ini
dom/canvas/test/webgl-mochitest/test_backends.html
gfx/angle/moz.build
gfx/angle/src/commit.h
gfx/angle/src/libANGLE/moz.build
gfx/angle/src/libEGL/moz.build
gfx/angle/src/libGLESv2/moz.build
--- a/dom/canvas/test/webgl-mochitest.ini
+++ b/dom/canvas/test/webgl-mochitest.ini
@@ -28,27 +28,27 @@ fail-if = (os == 'android') || (os == 'l
 fail-if = (os == 'android')
 [webgl-mochitest/ensure-exts/test_WEBGL_color_buffer_float.html]
 fail-if = (os == 'android')
 [webgl-mochitest/ensure-exts/test_WEBGL_compressed_texture_atc.html]
 fail-if = (os == 'android') || (os == 'linux') || (os == 'mac') || (os == 'win')
 [webgl-mochitest/ensure-exts/test_WEBGL_compressed_texture_es3.html]
 fail-if = (os == 'android') || (os == 'linux') || (os == 'mac') || (os == 'win')
 [webgl-mochitest/ensure-exts/test_WEBGL_compressed_texture_etc1.html]
-# Win7 is 6.1
-fail-if = (os == 'linux') || (os == 'mac') || (os == 'win' && (os_version == '5.1' || os_version == '6.1'))
+# WinXP is 5.1
+fail-if = (os == 'linux') || (os == 'mac') || (os == 'win' && os_version == '5.1')
 [webgl-mochitest/ensure-exts/test_WEBGL_compressed_texture_pvrtc.html]
 fail-if = (os == 'android') || (os == 'linux') || (os == 'mac') || (os == 'win')
 [webgl-mochitest/ensure-exts/test_WEBGL_compressed_texture_s3tc.html]
 fail-if = (os == 'android') || (os == 'linux')
 [webgl-mochitest/ensure-exts/test_WEBGL_depth_texture.html]
 fail-if = (os == 'mac' && os_version == '10.6')
 [webgl-mochitest/ensure-exts/test_WEBGL_draw_buffers.html]
-# Win7 is 6.1
-fail-if = (os == 'android') || (os == 'win' && (os_version == '5.1' || os_version == '6.1'))
+# WinXP is 5.1
+fail-if = (os == 'android') || (os == 'win' && os_version == '5.1')
 
 [webgl-mochitest/ensure-exts/test_common.html]
 
 
 [webgl-mochitest/test_backends.html]
 [webgl-mochitest/test_backbuffer_channels.html]
 fail-if = (os == 'b2g')
 [webgl-mochitest/test_depth_readpixels.html]
@@ -57,17 +57,17 @@ support-files = captureStream_common.js
 [webgl-mochitest/test_cubemap_must_be_square.html]
 [webgl-mochitest/test_depth_tex_lazy_clear.html]
 [webgl-mochitest/test_draw.html]
 [webgl-mochitest/test_fb_param.html]
 [webgl-mochitest/test_fb_param_crash.html]
 [webgl-mochitest/test_hidden_alpha.html]
 skip-if = (os == 'b2g') || buildapp == 'mulet' # Mulet - bug 1093639 (crashes in libLLVM-3.0.so)
 [webgl-mochitest/test_hidden_depth_stencil.html]
-fail-if = (os == 'win' && (os_version == '5.1' || os_version == '6.1'))
+fail-if = (os == 'win' && os_version == '5.1')
 [webgl-mochitest/test_implicit_color_buffer_float.html]
 [webgl-mochitest/test_highp_fs.html]
 [webgl-mochitest/test_no_arr_points.html]
 skip-if = android_version == '18' #Android 4.3 aws only; bug 1030942
 [webgl-mochitest/test_noprog_draw.html]
 [webgl-mochitest/test_privileged_exts.html]
 [webgl-mochitest/test_renderer_strings.html]
 [webgl-mochitest/test_sab_with_webgl.html]
--- a/dom/canvas/test/webgl-mochitest/test_backends.html
+++ b/dom/canvas/test/webgl-mochitest/test_backends.html
@@ -24,18 +24,17 @@ var ANGLE_IS_SINGLETON = true;
 
 var expectD3DType;
 try {
   // code borrowed from browser/modules/test/browser_taskbar_preview.js
   var version = SpecialPowers.Services.sysinfo.getProperty('version');
   version = parseFloat(version);
 
   // Version 6.0 is Vista, 6.1 is 7.
-  // Our Win7 slaves prefer d3d9, though!
-  if (version <= 6.1)
+  if (version <= 6.0)
     expectD3DType = 'd3d9';
   else
     expectD3DType = 'd3d11';
 } catch (e) {
   expectD3DType = 'd3d11';
 }
 
 function GetRenderer() {
--- a/gfx/angle/moz.build
+++ b/gfx/angle/moz.build
@@ -133,16 +133,17 @@ if CONFIG['MOZ_DIRECTX_SDK_PATH'] and no
 
 DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
 DEFINES['_HAS_EXCEPTIONS'] = 0
 
 if not CONFIG['MOZ_DEBUG']:
     DEFINES['_SECURE_SCL'] = 0
 
 DEFINES['ANGLE_ENABLE_D3D9'] = True
+DEFINES['ANGLE_SKIP_DXGI_1_2_CHECK'] = True
 if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
     DEFINES['ANGLE_ENABLE_D3D11'] = True
 
 DEFINES['ANGLE_COMPILE_OPTIMIZATION_LEVEL'] = 'D3DCOMPILE_OPTIMIZATION_LEVEL1'
 DEFINES['ANGLE_NO_EXCEPTIONS'] = True
 
 # We need these defined to nothing so that we don't get bogus dllimport declspecs
 DEFINES['GL_APICALL'] = ""
--- a/gfx/angle/src/commit.h
+++ b/gfx/angle/src/commit.h
@@ -1,3 +1,3 @@
-#define ANGLE_COMMIT_HASH "f1101625dbbe"
+#define ANGLE_COMMIT_HASH "0ed5ff9d075e"
 #define ANGLE_COMMIT_HASH_SIZE 12
-#define ANGLE_COMMIT_DATE "2016-02-24 21:04:03 -0500"
+#define ANGLE_COMMIT_DATE "2016-04-29 17:26:19 -0400"
--- a/gfx/angle/src/libANGLE/moz.build
+++ b/gfx/angle/src/libANGLE/moz.build
@@ -287,16 +287,17 @@ if CONFIG['MOZ_DIRECTX_SDK_PATH'] and no
 
 DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
 DEFINES['_HAS_EXCEPTIONS'] = 0
 
 if not CONFIG['MOZ_DEBUG']:
     DEFINES['_SECURE_SCL'] = 0
 
 DEFINES['ANGLE_ENABLE_D3D9'] = True
+DEFINES['ANGLE_SKIP_DXGI_1_2_CHECK'] = True
 if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
     DEFINES['ANGLE_ENABLE_D3D11'] = True
 
 DEFINES['ANGLE_COMPILE_OPTIMIZATION_LEVEL'] = 'D3DCOMPILE_OPTIMIZATION_LEVEL1'
 DEFINES['ANGLE_NO_EXCEPTIONS'] = True
 
 # We need these defined to nothing so that we don't get bogus dllimport declspecs
 DEFINES['GL_APICALL'] = ""
--- a/gfx/angle/src/libEGL/moz.build
+++ b/gfx/angle/src/libEGL/moz.build
@@ -37,16 +37,17 @@ if CONFIG['MOZ_DIRECTX_SDK_PATH'] and no
 
 DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
 DEFINES['_HAS_EXCEPTIONS'] = 0
 
 if not CONFIG['MOZ_DEBUG']:
     DEFINES['_SECURE_SCL'] = 0
 
 DEFINES['ANGLE_ENABLE_D3D9'] = True
+DEFINES['ANGLE_SKIP_DXGI_1_2_CHECK'] = True
 if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
     DEFINES['ANGLE_ENABLE_D3D11'] = True
 
 DEFINES['ANGLE_COMPILE_OPTIMIZATION_LEVEL'] = 'D3DCOMPILE_OPTIMIZATION_LEVEL1'
 DEFINES['ANGLE_NO_EXCEPTIONS'] = True
 
 # We need these defined to nothing so that we don't get bogus dllimport declspecs
 DEFINES['GL_APICALL'] = ""
--- a/gfx/angle/src/libGLESv2/moz.build
+++ b/gfx/angle/src/libGLESv2/moz.build
@@ -43,16 +43,17 @@ if CONFIG['MOZ_DIRECTX_SDK_PATH'] and no
 
 DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
 DEFINES['_HAS_EXCEPTIONS'] = 0
 
 if not CONFIG['MOZ_DEBUG']:
     DEFINES['_SECURE_SCL'] = 0
 
 DEFINES['ANGLE_ENABLE_D3D9'] = True
+DEFINES['ANGLE_SKIP_DXGI_1_2_CHECK'] = True
 if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
     DEFINES['ANGLE_ENABLE_D3D11'] = True
 
 DEFINES['ANGLE_COMPILE_OPTIMIZATION_LEVEL'] = 'D3DCOMPILE_OPTIMIZATION_LEVEL1'
 DEFINES['ANGLE_NO_EXCEPTIONS'] = True
 
 # We need these defined to nothing so that we don't get bogus dllimport declspecs
 DEFINES['GL_APICALL'] = ""