Commit 2a1c149b authored by Jeff Gilbert's avatar Jeff Gilbert
Browse files

Bug 1691547 - Post-ANGLE-update Gecko fixes and re-mark tests. r=lsalzman, a=RyanVM 

Differential Revision: https://phabricator.services.mozilla.com/D103957
parent 0f433a50

dom/canvas/WebGLShaderValidator.cpp

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ std::unique_ptr<webgl::ShaderValidator> WebGLContext::CreateShaderValidator( 
    resources.EXT_shader_texture_lod = 1;



  if (IsExtensionEnabled(WebGLExtensionID::OVR_multiview2)) {

    resources.OVR_multiview = 1;

    resources.OVR_multiview2 = 1;

    resources.MaxViewsOVR = limits.maxMultiviewLayers;

  }

dom/canvas/test/webgl-conf/generated-mochitest.ini

+1 −3
Original line number Diff line number Diff line
@@ -5097,6 +5097,7 @@ subsuite = webgl2-core 
skip-if = (os == "android") #Bug 1658801

[generated/test_2_conformance2__extensions__ovr_multiview2.html]

subsuite = webgl2-core

fail-if = (os == 'win')

skip-if = (os == 'android')

[generated/test_2_conformance2__extensions__ovr_multiview2_depth.html]

subsuite = webgl2-core
@@ -5184,7 +5185,6 @@ subsuite = webgl2-ext 
subsuite = webgl2-ext

[generated/test_2_conformance2__glsl3__sampler-array-indexing.html]

subsuite = webgl2-ext

fail-if = (os == 'android') || (os == 'mac') || (os == 'win')

[generated/test_2_conformance2__glsl3__sampler-no-precision.html]

subsuite = webgl2-ext

[generated/test_2_conformance2__glsl3__sequence-operator-returns-non-constant.html]
@@ -5381,7 +5381,6 @@ subsuite = webgl2-core 
fail-if = (os == 'android') || (os == 'mac')

[generated/test_2_conformance2__rendering__framebuffer-texture-changing-base-level.html]

subsuite = webgl2-core

fail-if = (os == 'win')

[generated/test_2_conformance2__rendering__framebuffer-texture-level1.html]

subsuite = webgl2-core

fail-if = (os == 'mac')
@@ -7446,7 +7445,6 @@ subsuite = webgl2-core 
subsuite = webgl2-core

[generated/test_2_conformance2__uniforms__large-uniform-buffers.html]

subsuite = webgl2-core

fail-if = (os == 'win' && os_version == '10.0')

[generated/test_2_conformance2__uniforms__query-uniform-blocks-after-shader-detach.html]

subsuite = webgl2-core

[generated/test_2_conformance2__uniforms__simple-buffer-change.html]

dom/canvas/test/webgl-conf/mochitest-errata.ini

+4 −9
Original line number Diff line number Diff line
@@ -93,6 +93,9 @@ skip-if = (os == 'linux' && asan) 
# Global



[generated/test_2_conformance2__extensions__ovr_multiview2.html]

# Windows failure: ANGLE bug: FAIL #extension GL_OVR_multiview must be forbidden.

#   Because we have to enable multiview1 to get ANGLE to emit gl_ViewID_OVR.

fail-if = (os == 'win')

skip-if = (os == 'android')

#[task 2020-01-06T23:47:51.786Z] 23:47:51     INFO -  GPU: UNKNOWN

#[task 2020-01-06T23:47:51.786Z] 23:47:51     INFO -  Crash reason:  SIGSEGV /SEGV_MAPERR
@@ -272,9 +275,6 @@ fail-if = (os == 'mac') 
fail-if = (os == 'mac')

[generated/test_2_conformance2__textures__misc__tex-storage-compressed-formats.html]

fail-if = (os == 'linux') || (os == 'mac') || (os == 'win')

[generated/test_2_conformance2__glsl3__sampler-array-indexing.html]

fail-if = (os == 'android') || (os == 'mac') || (os == 'win')

# Needs ANGLE shader translator update



########################################################################

# Complicated
@@ -1222,13 +1222,8 @@ skip-if = (os == 'win') 
# framebuffer layer 0 should be green

# framebuffer layer 1 should be green

fail-if = (os == 'win')

[generated/test_2_conformance2__rendering__framebuffer-texture-changing-base-level.html]

# https://bugzilla.mozilla.org/show_bug.cgi?id=1501868 (ANGLE bug)

fail-if = (os == 'win')



[generated/test_2_conformance__textures__misc__mipmap-fbo.html]

fail-if = (os == "win" && processor == "aarch64") #aarch64 due to 1536182

[generated/test_conformance__textures__misc__mipmap-fbo.html]

fail-if = (os == "win" && processor == "aarch64") #aarch64 due to 1536182
 
[generated/test_2_conformance2__uniforms__large-uniform-buffers.html]

fail-if = (os == 'win' && os_version == '10.0')

dom/canvas/test/webgl-mochitest/mochitest.ini

+1 −2
Original line number Diff line number Diff line
@@ -26,11 +26,10 @@ fail-if = (os == 'android') 
[ensure-exts/test_EXT_texture_compression_bptc.html]

fail-if = (os == 'android') || (os == 'linux' && os_version == '16.04') || (os == 'mac')

[ensure-exts/test_EXT_texture_compression_rgtc.html]

fail-if = (os == 'android') || (os == 'win')

fail-if = (os == 'android')

[ensure-exts/test_EXT_texture_filter_anisotropic.html]

fail-if = (os == 'linux')

[ensure-exts/test_OES_fbo_render_mipmap.html]

fail-if = (os == 'win')

[ensure-exts/test_OES_standard_derivatives.html]

[ensure-exts/test_OVR_multiview2.html]

fail-if = (os == 'linux') || (os == 'mac')