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

Bug 1271784. Allow WARP WebGL on Windows 7 without SP 1 r=jgilbert 

ANGLE doesn't allow WARP on DXGI < 1.2 by default, but it will work fine
for us.
This commit is contained in:
Jeff Muizelaar 2016-05-12 10:39:43 -04:00
Родитель a3f941f071
Коммит 6c2297a047
9 изменённых файлов: 18 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
dom/canvas/test/webgl-conf/generated-mochitest.ini
Просмотреть файл

@ -2960,7 +2960,7 @@ fail-if = (os == 'android') || (os == 'linux')
[generated/test_conformance__ogles__GL__log__log_001_to_008.html]
[generated/test_conformance__ogles__GL__log__log_009_to_012.html]
[generated/test_conformance__ogles__GL__mat3__mat3_001_to_006.html]
skip-if = (os == 'win' && (os_version == '6.2' || os_version == '6.3'))
skip-if = (os == 'win' && os_version != '5.1')
[generated/test_conformance__ogles__GL__mat__mat_001_to_008.html]
[generated/test_conformance__ogles__GL__mat__mat_009_to_016.html]
[generated/test_conformance__ogles__GL__mat__mat_017_to_024.html]
@ -3082,7 +3082,7 @@ skip-if = (os == 'mac') || (os == 'android')
[generated/test_conformance__state__state-uneffected-after-compositing.html]
[generated/test_conformance__textures__compressed-tex-image.html]
[generated/test_conformance__textures__copy-tex-image-2d-formats.html]
skip-if = (os == 'win' && (os_version == '5.1' || os_version == '6.1'))
skip-if = (os == 'win' && os_version == '5.1')
[generated/test_conformance__textures__copy-tex-image-and-sub-image-2d.html]
[generated/test_conformance__textures__default-texture.html]
[generated/test_conformance__textures__gl-get-tex-parameter.html]
@ -3181,4 +3181,4 @@ skip-if = (os == 'android') || (os == 'linux') || (os == 'win')
[generated/test_conformance__uniforms__uniform-location.html]
[generated/test_conformance__uniforms__uniform-samplers-test.html]
[generated/test_conformance__uniforms__uniform-values-per-program.html]
skip-if = (os == 'win' && (os_version == '6.2' || os_version == '6.3'))
skip-if = (os == 'win' && os_version != '5.1')

10
dom/canvas/test/webgl-conf/mochitest-errata.ini
Просмотреть файл

@ -76,8 +76,8 @@ skip-if = 1
# Timeout on Windows, crash on Android/Linux.
skip-if = (os == 'android') || (os == 'linux') || (os == 'win')
[generated/test_conformance__ogles__GL__mat3__mat3_001_to_006.html]
# Timeout on Windows 8
skip-if = (os == 'win' && (os_version == '6.2' || os_version == '6.3'))
# Timeout on D3D11
skip-if = (os == 'win' && os_version != '5.1')
########################################################################
# Complicated
@ -452,7 +452,7 @@ fail-if = (os == 'mac' && os_version == '10.10')
fail-if = (os == 'win' && os_version == '5.1')
[generated/test_conformance__textures__copy-tex-image-2d-formats.html]
# Assert failure in DEBUG
skip-if = (os == 'win' && (os_version == '5.1' || os_version == '6.1'))
skip-if = (os == 'win' && os_version == '5.1')
[generated/test_conformance__uniforms__uniform-values-per-program.html]
# Crashes on Windows 8 debug.
skip-if = (os == 'win' && (os_version == '6.2' || os_version == '6.3'))
# Crashes on D3D11 debug.
skip-if = (os == 'win' && os_version != '5.1')

8
dom/canvas/test/webgl-mochitest/mochitest.ini
Просмотреть файл

@ -33,8 +33,7 @@ fail-if = (os == 'android') || (os == 'linux') || (os == 'mac') || (os == 'win')
[ensure-exts/test_WEBGL_compressed_texture_es3.html]
fail-if = (os == 'android') || (os == 'linux') || (os == 'mac') || (os == 'win')
[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'))
fail-if = (os == 'linux') || (os == 'mac') || (os == 'win' && os_version == '5.1')
[ensure-exts/test_WEBGL_compressed_texture_pvrtc.html]
fail-if = (os == 'android') || (os == 'linux') || (os == 'mac') || (os == 'win')
[ensure-exts/test_WEBGL_compressed_texture_s3tc.html]
@ -42,8 +41,7 @@ fail-if = (os == 'android') || (os == 'linux')
[ensure-exts/test_WEBGL_depth_texture.html]
fail-if = (os == 'mac' && os_version == '10.6')
[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'))
fail-if = (os == 'android') || (os == 'win' && os_version == '5.1')
[ensure-exts/test_common.html]
@ -64,7 +62,7 @@ support-files = ../captureStream_common.js
[test_hidden_alpha.html]
skip-if = (os == 'b2g') || buildapp == 'mulet' # Mulet - bug 1093639 (crashes in libLLVM-3.0.so)
[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')
[test_implicit_color_buffer_float.html]
[test_highp_fs.html]
[test_no_arr_points.html]

3
dom/canvas/test/webgl-mochitest/test_backends.html
Просмотреть файл

@ -29,8 +29,7 @@ try {
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';

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

@ -138,6 +138,7 @@ 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

4
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"

1
gfx/angle/src/libANGLE/moz.build
Просмотреть файл

@ -292,6 +292,7 @@ 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

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

@ -42,6 +42,7 @@ 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

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

@ -48,6 +48,7 @@ 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