diff options
8 files changed, 108 insertions, 123 deletions
diff --git a/components/script/dom/webgl2renderingcontext.rs b/components/script/dom/webgl2renderingcontext.rs index 21d917d4992..71ec9388d87 100644 --- a/components/script/dom/webgl2renderingcontext.rs +++ b/components/script/dom/webgl2renderingcontext.rs @@ -185,18 +185,17 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext { } /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn AttachShader(&self, program: Option<&WebGLProgram>, shader: Option<&WebGLShader>) { + fn AttachShader(&self, program: &WebGLProgram, shader: &WebGLShader) { self.base.AttachShader(program, shader) } /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn DetachShader(&self, program: Option<&WebGLProgram>, shader: Option<&WebGLShader>) { + fn DetachShader(&self, program: &WebGLProgram, shader: &WebGLShader) { self.base.DetachShader(program, shader) } /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn BindAttribLocation(&self, program: Option<&WebGLProgram>, - index: u32, name: DOMString) { + fn BindAttribLocation(&self, program: &WebGLProgram, index: u32, name: DOMString) { self.base.BindAttribLocation(program, index, name) } diff --git a/components/script/dom/webgl_extensions/ext/mod.rs b/components/script/dom/webgl_extensions/ext/mod.rs index 1c3994fba40..71713a45a47 100644 --- a/components/script/dom/webgl_extensions/ext/mod.rs +++ b/components/script/dom/webgl_extensions/ext/mod.rs @@ -5,6 +5,7 @@ use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants; use super::{ext_constants, WebGLExtension, WebGLExtensions, WebGLExtensionSpec}; +pub mod oeselementindexuint; pub mod oesstandardderivatives; pub mod oestexturefloat; pub mod oestexturefloatlinear; diff --git a/components/script/dom/webgl_extensions/ext/oeselementindexuint.rs b/components/script/dom/webgl_extensions/ext/oeselementindexuint.rs new file mode 100644 index 00000000000..007cd72d18f --- /dev/null +++ b/components/script/dom/webgl_extensions/ext/oeselementindexuint.rs @@ -0,0 +1,50 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +use canvas_traits::webgl::WebGLVersion; +use dom::bindings::codegen::Bindings::OESElementIndexUintBinding; +use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object}; +use dom::bindings::root::DomRoot; +use dom::webglrenderingcontext::WebGLRenderingContext; +use dom_struct::dom_struct; +use super::{WebGLExtension, WebGLExtensions, WebGLExtensionSpec}; + +#[dom_struct] +pub struct OESElementIndexUint { + reflector_: Reflector, +} + +impl OESElementIndexUint { + fn new_inherited() -> Self { + Self { reflector_: Reflector::new() } + } +} + +impl WebGLExtension for OESElementIndexUint { + type Extension = Self; + + fn new(ctx: &WebGLRenderingContext) -> DomRoot<Self> { + reflect_dom_object( + Box::new(OESElementIndexUint::new_inherited()), + &*ctx.global(), + OESElementIndexUintBinding::Wrap, + ) + } + + fn spec() -> WebGLExtensionSpec { + WebGLExtensionSpec::Specific(WebGLVersion::WebGL1) + } + + fn is_supported(ext: &WebGLExtensions) -> bool { + ext.supports_gl_extension("GL_OES_element_index_uint") + } + + fn enable(ext: &WebGLExtensions) { + ext.enable_element_index_uint(); + } + + fn name() -> &'static str { + "OES_element_index_uint" + } +} diff --git a/components/script/dom/webgl_extensions/extensions.rs b/components/script/dom/webgl_extensions/extensions.rs index 3c22817d555..7e7ccf301e7 100644 --- a/components/script/dom/webgl_extensions/extensions.rs +++ b/components/script/dom/webgl_extensions/extensions.rs @@ -57,17 +57,20 @@ struct WebGLExtensionFeatures { hint_targets: FnvHashSet<GLenum>, /// WebGL GetParameter() names enabled by extensions. disabled_get_parameter_names: FnvHashSet<GLenum>, + /// WebGL OES_element_index_uint extension. + element_index_uint_enabled: bool, } impl WebGLExtensionFeatures { fn new(webgl_version: WebGLVersion) -> Self { - let (disabled_tex_types, disabled_get_parameter_names) = match webgl_version { + let (disabled_tex_types, disabled_get_parameter_names, element_index_uint_enabled) = match webgl_version { WebGLVersion::WebGL1 => { (DEFAULT_DISABLED_TEX_TYPES_WEBGL1.iter().cloned().collect(), - DEFAULT_DISABLED_GET_PARAMETER_NAMES_WEBGL1.iter().cloned().collect()) + DEFAULT_DISABLED_GET_PARAMETER_NAMES_WEBGL1.iter().cloned().collect(), + false) }, WebGLVersion::WebGL2 => { - (Default::default(), Default::default()) + (Default::default(), Default::default(), true) } }; Self { @@ -78,6 +81,7 @@ impl WebGLExtensionFeatures { query_parameter_handlers: Default::default(), hint_targets: Default::default(), disabled_get_parameter_names, + element_index_uint_enabled, } } } @@ -96,7 +100,7 @@ impl WebGLExtensions { Self { extensions: DomRefCell::new(HashMap::new()), features: DomRefCell::new(WebGLExtensionFeatures::new(webgl_version)), - webgl_version + webgl_version, } } @@ -240,6 +244,14 @@ impl WebGLExtensions { self.register::<ext::oestexturehalffloatlinear::OESTextureHalfFloatLinear>(); self.register::<ext::oesvertexarrayobject::OESVertexArrayObject>(); } + + pub fn enable_element_index_uint(&self) { + self.features.borrow_mut().element_index_uint_enabled = true; + } + + pub fn is_element_index_uint_enabled(&self) -> bool { + self.features.borrow().element_index_uint_enabled + } } // Helper structs diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index 30c60feea35..37d117a93fd 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -1514,29 +1514,18 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn AttachShader(&self, program: Option<&WebGLProgram>, shader: Option<&WebGLShader>) { - if let Some(program) = program { - if let Some(shader) = shader { - handle_potential_webgl_error!(self, program.attach_shader(shader)); - } - } + fn AttachShader(&self, program: &WebGLProgram, shader: &WebGLShader) { + handle_potential_webgl_error!(self, program.attach_shader(shader)); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn DetachShader(&self, program: Option<&WebGLProgram>, shader: Option<&WebGLShader>) { - if let Some(program) = program { - if let Some(shader) = shader { - handle_potential_webgl_error!(self, program.detach_shader(shader)); - } - } + fn DetachShader(&self, program: &WebGLProgram, shader: &WebGLShader) { + handle_potential_webgl_error!(self, program.detach_shader(shader)); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn BindAttribLocation(&self, program: Option<&WebGLProgram>, - index: u32, name: DOMString) { - if let Some(program) = program { - handle_potential_webgl_error!(self, program.bind_attrib_location(index, name)); - } + fn BindAttribLocation(&self, program: &WebGLProgram, index: u32, name: DOMString) { + handle_potential_webgl_error!(self, program.bind_attrib_location(index, name)); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5 @@ -2174,6 +2163,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { let type_size = match type_ { constants::UNSIGNED_BYTE => 1, constants::UNSIGNED_SHORT => 2, + constants::UNSIGNED_INT if self.extension_manager.is_element_index_uint_enabled() => 4, _ => return self.webgl_error(InvalidEnum), }; diff --git a/components/script/dom/webidls/OESElementIndexUint.webidl b/components/script/dom/webidls/OESElementIndexUint.webidl new file mode 100644 index 00000000000..b1d34ca957c --- /dev/null +++ b/components/script/dom/webidls/OESElementIndexUint.webidl @@ -0,0 +1,11 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* + * WebGL IDL definitions from the Khronos specification: + * https://www.khronos.org/registry/webgl/extensions/OES_element_index_uint/ + */ + +[NoInterfaceObject] +interface OESElementIndexUint { +}; diff --git a/components/script/dom/webidls/WebGLRenderingContext.webidl b/components/script/dom/webidls/WebGLRenderingContext.webidl index 6725b9f6933..819e0d82179 100644 --- a/components/script/dom/webidls/WebGLRenderingContext.webidl +++ b/components/script/dom/webidls/WebGLRenderingContext.webidl @@ -475,8 +475,8 @@ interface WebGLRenderingContextBase object? getExtension(DOMString name); void activeTexture(GLenum texture); - void attachShader(WebGLProgram? program, WebGLShader? shader); - void bindAttribLocation(WebGLProgram? program, GLuint index, DOMString name); + void attachShader(WebGLProgram program, WebGLShader shader); + void bindAttribLocation(WebGLProgram program, GLuint index, DOMString name); void bindBuffer(GLenum target, WebGLBuffer? buffer); void bindFramebuffer(GLenum target, WebGLFramebuffer? framebuffer); void bindRenderbuffer(GLenum target, WebGLRenderbuffer? renderbuffer); @@ -559,7 +559,7 @@ interface WebGLRenderingContextBase void depthFunc(GLenum func); void depthMask(GLboolean flag); void depthRange(GLclampf zNear, GLclampf zFar); - void detachShader(WebGLProgram? program, WebGLShader? shader); + void detachShader(WebGLProgram program, WebGLShader shader); void disable(GLenum cap); void disableVertexAttribArray(GLuint index); void drawArrays(GLenum mode, GLint first, GLsizei count); diff --git a/tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/rendering/element-index-uint.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/rendering/element-index-uint.html.ini index b08402b8368..c7c6e8afc5d 100644 --- a/tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/rendering/element-index-uint.html.ini +++ b/tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/rendering/element-index-uint.html.ini @@ -2,132 +2,54 @@ [WebGL test #1: Draw 0 failed pixel test] expected: FAIL - [WebGL test #2: Error in program linking:One or more shaders failed to compile] + [WebGL test #2: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] expected: FAIL - [WebGL test #4: getError expected: NO_ERROR. Was INVALID_OPERATION : ] + [WebGL test #11: getError expected: INVALID_OPERATION. Was NO_ERROR : ] expected: FAIL - [WebGL test #6: getError expected: NO_ERROR. Was INVALID_ENUM : ] + [WebGL test #14: getError expected: INVALID_OPERATION. Was NO_ERROR : ] expected: FAIL - [WebGL test #7: getError expected: NO_ERROR. Was INVALID_VALUE : ] + [WebGL test #20: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 0)] expected: FAIL - [WebGL test #9: getError expected: NO_ERROR. Was INVALID_ENUM : ] + [WebGL test #21: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 8)] expected: FAIL - [WebGL test #10: getError expected: NO_ERROR. Was INVALID_VALUE : ] + [WebGL test #23: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 0)] expected: FAIL - [WebGL test #12: getError expected: INVALID_OPERATION. Was INVALID_ENUM : ] + [WebGL test #24: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 8)] expected: FAIL - [WebGL test #13: getError expected: NO_ERROR. Was INVALID_VALUE : ] + [WebGL test #33: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 0)] expected: FAIL - [WebGL test #15: getError expected: INVALID_OPERATION. Was INVALID_ENUM : ] + [WebGL test #34: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 8)] expected: FAIL - [WebGL test #18: getError expected: INVALID_VALUE. Was INVALID_ENUM : ] + [WebGL test #49: getError expected: INVALID_OPERATION. Was NO_ERROR : ] expected: FAIL - [WebGL test #20: Error in program linking:One or more shaders failed to compile] + [WebGL test #52: getError expected: INVALID_OPERATION. Was NO_ERROR : ] expected: FAIL - [WebGL test #21: getError expected: NO_ERROR. Was INVALID_OPERATION : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 4)] + [WebGL test #58: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 0)] expected: FAIL - [WebGL test #22: getError expected: INVALID_OPERATION. Was INVALID_ENUM : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 0)] + [WebGL test #59: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 8)] expected: FAIL - [WebGL test #23: getError expected: INVALID_OPERATION. Was INVALID_ENUM : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 8)] + [WebGL test #61: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 0)] expected: FAIL - [WebGL test #24: getError expected: NO_ERROR. Was INVALID_ENUM : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 4)] + [WebGL test #62: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 8)] expected: FAIL - [WebGL test #25: getError expected: INVALID_OPERATION. Was INVALID_ENUM : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 0)] + [WebGL test #71: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 0)] expected: FAIL - [WebGL test #26: getError expected: INVALID_OPERATION. Was INVALID_ENUM : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 8)] - expected: FAIL - - [WebGL test #33: getError expected: NO_ERROR. Was INVALID_ENUM : after drawing] - expected: FAIL - - [WebGL test #34: getError expected: NO_ERROR. Was INVALID_ENUM : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 4)] - expected: FAIL - - [WebGL test #35: getError expected: INVALID_OPERATION. Was INVALID_ENUM : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 0)] - expected: FAIL - - [WebGL test #36: getError expected: INVALID_OPERATION. Was INVALID_ENUM : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 8)] - expected: FAIL - - [WebGL test #41: Draw 0 failed pixel test] - expected: FAIL - - [WebGL test #42: Error in program linking:One or more shaders failed to compile] - expected: FAIL - - [WebGL test #44: getError expected: NO_ERROR. Was INVALID_OPERATION : ] - expected: FAIL - - [WebGL test #46: getError expected: NO_ERROR. Was INVALID_ENUM : ] - expected: FAIL - - [WebGL test #47: getError expected: NO_ERROR. Was INVALID_VALUE : ] - expected: FAIL - - [WebGL test #49: getError expected: NO_ERROR. Was INVALID_ENUM : ] - expected: FAIL - - [WebGL test #50: getError expected: NO_ERROR. Was INVALID_VALUE : ] - expected: FAIL - - [WebGL test #52: getError expected: INVALID_OPERATION. Was INVALID_ENUM : ] - expected: FAIL - - [WebGL test #53: getError expected: NO_ERROR. Was INVALID_VALUE : ] - expected: FAIL - - [WebGL test #55: getError expected: INVALID_OPERATION. Was INVALID_ENUM : ] - expected: FAIL - - [WebGL test #58: getError expected: INVALID_VALUE. Was INVALID_ENUM : ] - expected: FAIL - - [WebGL test #60: Error in program linking:One or more shaders failed to compile] - expected: FAIL - - [WebGL test #61: getError expected: NO_ERROR. Was INVALID_OPERATION : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 4)] - expected: FAIL - - [WebGL test #62: getError expected: INVALID_OPERATION. Was INVALID_ENUM : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 0)] - expected: FAIL - - [WebGL test #63: getError expected: INVALID_OPERATION. Was INVALID_ENUM : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 8)] - expected: FAIL - - [WebGL test #64: getError expected: NO_ERROR. Was INVALID_ENUM : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 4)] - expected: FAIL - - [WebGL test #65: getError expected: INVALID_OPERATION. Was INVALID_ENUM : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 0)] - expected: FAIL - - [WebGL test #66: getError expected: INVALID_OPERATION. Was INVALID_ENUM : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 8)] - expected: FAIL - - [WebGL test #73: getError expected: NO_ERROR. Was INVALID_ENUM : after drawing] - expected: FAIL - - [WebGL test #74: getError expected: NO_ERROR. Was INVALID_ENUM : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 4)] - expected: FAIL - - [WebGL test #75: getError expected: INVALID_OPERATION. Was INVALID_ENUM : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 0)] - expected: FAIL - - [WebGL test #76: getError expected: INVALID_OPERATION. Was INVALID_ENUM : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 8)] + [WebGL test #72: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLE_STRIP, 4, gl.UNSIGNED_INT, 8)] expected: FAIL |