diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2018-06-11 13:54:13 +0200 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2018-06-12 12:33:32 +0200 |
| commit | c7603bd4ca5f7a41486d8a0afd623718e57c044f (patch) | |
| tree | cf6f81a3c25f375057a1d60998ae10db8c215b3e | |
| parent | a76777b11506e066f6131ae20de1a3ab370f4a75 (diff) | |
| download | servo-c7603bd4ca5f7a41486d8a0afd623718e57c044f.tar.gz servo-c7603bd4ca5f7a41486d8a0afd623718e57c044f.zip | |
Don't check for GL_OES_element_index_unit with desktop GL (fixes #20921)
| -rw-r--r-- | components/script/dom/webgl_extensions/ext/oeselementindexuint.rs | 6 | ||||
| -rw-r--r-- | tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/extensions/oes-element-index-uint.html.ini | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/components/script/dom/webgl_extensions/ext/oeselementindexuint.rs b/components/script/dom/webgl_extensions/ext/oeselementindexuint.rs index 007cd72d18f..0e5ad367547 100644 --- a/components/script/dom/webgl_extensions/ext/oeselementindexuint.rs +++ b/components/script/dom/webgl_extensions/ext/oeselementindexuint.rs @@ -37,7 +37,11 @@ impl WebGLExtension for OESElementIndexUint { } fn is_supported(ext: &WebGLExtensions) -> bool { - ext.supports_gl_extension("GL_OES_element_index_uint") + if cfg!(any(target_os = "android", target_os = "ios")) { + return ext.supports_gl_extension("GL_OES_element_index_uint"); + } + // This extension is always available in desktop OpenGL. + true } fn enable(ext: &WebGLExtensions) { diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/extensions/oes-element-index-uint.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/extensions/oes-element-index-uint.html.ini new file mode 100644 index 00000000000..f56e13215da --- /dev/null +++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/extensions/oes-element-index-uint.html.ini @@ -0,0 +1,7 @@ +[oes-element-index-uint.html] + [WebGL test #20: getError expected: INVALID_OPERATION. Was NO_ERROR : ] + expected: FAIL + + [WebGL test #64: getError expected: INVALID_OPERATION. Was NO_ERROR : ] + expected: FAIL + |