diff --git a/components/script/dom/webgl2renderingcontext.rs b/components/script/dom/webgl2renderingcontext.rs index dd0701ace99..9e05797c188 100644 --- a/components/script/dom/webgl2renderingcontext.rs +++ b/components/script/dom/webgl2renderingcontext.rs @@ -974,6 +974,14 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext { level: i32) { self.base.FramebufferTexture2D(target, attachment, textarget, texture, level) } + + /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 + fn GetAttachedShaders( + &self, + program: &WebGLProgram, + ) -> Option>> { + self.base.GetAttachedShaders(program) + } } diff --git a/components/script/dom/webglprogram.rs b/components/script/dom/webglprogram.rs index f08c40f5500..115b866b984 100644 --- a/components/script/dom/webglprogram.rs +++ b/components/script/dom/webglprogram.rs @@ -367,6 +367,19 @@ impl WebGLProgram { self.renderer.send(WebGLCommand::GetProgramParameter(self.id, param_id, sender)).unwrap(); receiver.recv().unwrap() } + + pub fn attached_shaders(&self) -> WebGLResult>> { + if self.is_deleted.get() { + return Err(WebGLError::InvalidValue); + } + Ok(match (self.vertex_shader.get(), self.fragment_shader.get()) { + (Some(vertex_shader), Some(fragment_shader)) => { + vec![vertex_shader, fragment_shader] + } + (Some(shader), None) | (None, Some(shader)) => vec![shader], + (None, None) => vec![] + }) + } } impl Drop for WebGLProgram { diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index 204426f8063..24c0c3df069 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -1237,21 +1237,41 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { #[allow(unsafe_code)] // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5 - unsafe fn GetBufferParameter(&self, _cx: *mut JSContext, target: u32, parameter: u32) -> JSVal { - let parameter_matches = match parameter { - constants::BUFFER_SIZE | - constants::BUFFER_USAGE => true, - _ => false, + unsafe fn GetBufferParameter( + &self, + _cx: *mut JSContext, + target: u32, + parameter: u32, + ) -> JSVal { + let buffer = match target { + constants::ARRAY_BUFFER => self.bound_buffer_array.get(), + constants::ELEMENT_ARRAY_BUFFER => self.bound_buffer_element_array.get(), + _ => { + self.webgl_error(InvalidEnum); + return NullValue(); + } + }; + match parameter { + constants::BUFFER_SIZE | constants::BUFFER_USAGE => {}, + _ => { + self.webgl_error(InvalidEnum); + return NullValue(); + } + } + let buffer = match buffer { + Some(buffer) => buffer, + None => { + self.webgl_error(InvalidOperation); + return NullValue(); + } }; - if !parameter_matches { - self.webgl_error(InvalidEnum); - return NullValue(); + if parameter == constants::BUFFER_SIZE { + return Int32Value(buffer.capacity() as i32); } let (sender, receiver) = webgl_channel().unwrap(); self.send_command(WebGLCommand::GetBufferParameter(target, parameter, sender)); - Int32Value(receiver.recv().unwrap()) } @@ -1946,7 +1966,10 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 fn CompileShader(&self, shader: &WebGLShader) { - shader.compile(self.webgl_version, self.glsl_version, &self.extension_manager) + handle_potential_webgl_error!( + self, + shader.compile(self.webgl_version, self.glsl_version, &self.extension_manager) + ) } // TODO(emilio): Probably in the future we should keep track of the @@ -3578,6 +3601,14 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { None => self.webgl_error(InvalidOperation), }; } + + /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 + fn GetAttachedShaders( + &self, + program: &WebGLProgram, + ) -> Option>> { + handle_potential_webgl_error!(self, program.attached_shaders().map(Some), None) + } } pub trait LayoutCanvasWebGLRenderingContextHelpers { diff --git a/components/script/dom/webglshader.rs b/components/script/dom/webglshader.rs index 2a6504be506..0e965b01b3b 100644 --- a/components/script/dom/webglshader.rs +++ b/components/script/dom/webglshader.rs @@ -3,8 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // https://www.khronos.org/registry/webgl/specs/latest/1.0/webgl.idl -use canvas_traits::webgl::{WebGLSLVersion, WebGLVersion}; -use canvas_traits::webgl::{webgl_channel, WebGLCommand, WebGLMsgSender, WebGLParameter, WebGLResult, WebGLShaderId}; +use canvas_traits::webgl::{WebGLCommand, WebGLError, WebGLMsgSender}; +use canvas_traits::webgl::{WebGLParameter, WebGLResult, WebGLSLVersion}; +use canvas_traits::webgl::{WebGLShaderId, WebGLVersion, webgl_channel}; use dom::bindings::cell::DomRefCell; use dom::bindings::codegen::Bindings::WebGLShaderBinding; use dom::bindings::reflector::reflect_dom_object; @@ -98,74 +99,83 @@ impl WebGLShader { &self, webgl_version: WebGLVersion, glsl_version: WebGLSLVersion, - ext: &WebGLExtensions - ) { + ext: &WebGLExtensions, + ) -> WebGLResult<()> { + if self.is_deleted.get() && !self.is_attached() { + return Err(WebGLError::InvalidValue); + } if self.compilation_status.get() != ShaderCompilationStatus::NotCompiled { debug!("Compiling already compiled shader {}", self.id); } - if let Some(ref source) = *self.source.borrow() { - let mut params = BuiltInResources::default(); - params.FragmentPrecisionHigh = 1; - params.OES_standard_derivatives = ext.is_enabled::() as i32; - let validator = match webgl_version { - WebGLVersion::WebGL1 => { - let output_format = if cfg!(any(target_os = "android", target_os = "ios")) { - Output::Essl - } else { - Output::Glsl - }; - ShaderValidator::for_webgl(self.gl_type, - output_format, - ¶ms).unwrap() - }, - WebGLVersion::WebGL2 => { - let output_format = if cfg!(any(target_os = "android", target_os = "ios")) { - Output::Essl - } else { - match (glsl_version.major, glsl_version.minor) { - (1, 30) => Output::Glsl130, - (1, 40) => Output::Glsl140, - (1, 50) => Output::Glsl150Core, - (3, 30) => Output::Glsl330Core, - (4, 0) => Output::Glsl400Core, - (4, 10) => Output::Glsl410Core, - (4, 20) => Output::Glsl420Core, - (4, 30) => Output::Glsl430Core, - (4, 40) => Output::Glsl440Core, - (4, _) => Output::Glsl450Core, - _ => Output::Glsl140 - } - }; - ShaderValidator::for_webgl2(self.gl_type, - output_format, - ¶ms).unwrap() - }, - }; + let source = self.source.borrow(); + let source = match source.as_ref() { + Some(source) => source, + None => return Ok(()), + }; - match validator.compile_and_translate(&[source]) { - Ok(translated_source) => { - debug!("Shader translated: {}", translated_source); - // NOTE: At this point we should be pretty sure that the compilation in the paint thread - // will succeed. - // It could be interesting to retrieve the info log from the paint thread though - let msg = WebGLCommand::CompileShader(self.id, translated_source); - self.renderer.send(msg).unwrap(); - self.compilation_status.set(ShaderCompilationStatus::Succeeded); - }, - Err(error) => { - self.compilation_status.set(ShaderCompilationStatus::Failed); - debug!("Shader {} compilation failed: {}", self.id, error); - }, - } + let mut params = BuiltInResources::default(); + params.FragmentPrecisionHigh = 1; + params.OES_standard_derivatives = ext.is_enabled::() as i32; + let validator = match webgl_version { + WebGLVersion::WebGL1 => { + let output_format = if cfg!(any(target_os = "android", target_os = "ios")) { + Output::Essl + } else { + Output::Glsl + }; + ShaderValidator::for_webgl(self.gl_type, + output_format, + ¶ms).unwrap() + }, + WebGLVersion::WebGL2 => { + let output_format = if cfg!(any(target_os = "android", target_os = "ios")) { + Output::Essl + } else { + match (glsl_version.major, glsl_version.minor) { + (1, 30) => Output::Glsl130, + (1, 40) => Output::Glsl140, + (1, 50) => Output::Glsl150Core, + (3, 30) => Output::Glsl330Core, + (4, 0) => Output::Glsl400Core, + (4, 10) => Output::Glsl410Core, + (4, 20) => Output::Glsl420Core, + (4, 30) => Output::Glsl430Core, + (4, 40) => Output::Glsl440Core, + (4, _) => Output::Glsl450Core, + _ => Output::Glsl140 + } + }; + ShaderValidator::for_webgl2(self.gl_type, + output_format, + ¶ms).unwrap() + }, + }; - *self.info_log.borrow_mut() = Some(validator.info_log()); - // TODO(emilio): More data (like uniform data) should be collected - // here to properly validate uniforms. - // - // This requires a more complex interface with ANGLE, using C++ - // bindings and being extremely cautious about destructing things. + match validator.compile_and_translate(&[source]) { + Ok(translated_source) => { + debug!("Shader translated: {}", translated_source); + // NOTE: At this point we should be pretty sure that the compilation in the paint thread + // will succeed. + // It could be interesting to retrieve the info log from the paint thread though + let msg = WebGLCommand::CompileShader(self.id, translated_source); + self.renderer.send(msg).unwrap(); + self.compilation_status.set(ShaderCompilationStatus::Succeeded); + }, + Err(error) => { + self.compilation_status.set(ShaderCompilationStatus::Failed); + debug!("Shader {} compilation failed: {}", self.id, error); + }, } + + *self.info_log.borrow_mut() = Some(validator.info_log()); + + // TODO(emilio): More data (like uniform data) should be collected + // here to properly validate uniforms. + // + // This requires a more complex interface with ANGLE, using C++ + // bindings and being extremely cautious about destructing things. + Ok(()) } /// Mark this shader as deleted (if it wasn't previously) @@ -202,6 +212,9 @@ impl WebGLShader { /// glGetParameter pub fn parameter(&self, param_id: u32) -> WebGLResult { + if self.is_deleted.get() && !self.is_attached() { + return Err(WebGLError::InvalidValue); + } let (sender, receiver) = webgl_channel().unwrap(); self.renderer.send(WebGLCommand::GetShaderParameter(self.id, param_id, sender)).unwrap(); receiver.recv().unwrap() diff --git a/components/script/dom/webidls/WebGLRenderingContext.webidl b/components/script/dom/webidls/WebGLRenderingContext.webidl index 9921adf2504..5462f0dbad1 100644 --- a/components/script/dom/webidls/WebGLRenderingContext.webidl +++ b/components/script/dom/webidls/WebGLRenderingContext.webidl @@ -563,7 +563,7 @@ interface WebGLRenderingContextBase WebGLActiveInfo? getActiveAttrib(WebGLProgram program, GLuint index); WebGLActiveInfo? getActiveUniform(WebGLProgram program, GLuint index); - //sequence? getAttachedShaders(WebGLProgram? program); + sequence? getAttachedShaders(WebGLProgram program); [WebGLHandlesContextLoss] GLint getAttribLocation(WebGLProgram program, DOMString name); diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/methods.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/methods.html.ini index 0f3f17e39b3..39826c520c3 100644 --- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/methods.html.ini +++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/methods.html.ini @@ -1,14 +1,10 @@ [methods.html] - type: testharness - [WebGL test #0: Property either does not exist or is not a function: getAttachedShaders] + [WebGL test #0: Property either does not exist or is not a function: getRenderbufferParameter] expected: FAIL - [WebGL test #1: Property either does not exist or is not a function: getRenderbufferParameter] + [WebGL test #1: Property either does not exist or is not a function: getUniform] expected: FAIL - [WebGL test #2: Property either does not exist or is not a function: getUniform] - expected: FAIL - - [WebGL test #3: Property either does not exist or is not a function: isContextLost] + [WebGL test #2: Property either does not exist or is not a function: isContextLost] expected: FAIL diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/null-object-behaviour.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/null-object-behaviour.html.ini index c18d4b53eb6..ffd049d0cd1 100644 --- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/null-object-behaviour.html.ini +++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/null-object-behaviour.html.ini @@ -1,3 +1,7 @@ [null-object-behaviour.html] - type: testharness - expected: CRASH + [WebGL test #3: getError expected: INVALID_VALUE. Was NO_ERROR : after evaluating: context.linkProgram(undefined)] + expected: FAIL + + [WebGL test #38: getError expected: INVALID_OPERATION. Was INVALID_VALUE : after evaluating: context.bufferData(context.ARRAY_BUFFER, 1, context.STATIC_DRAW)] + expected: FAIL + diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-A.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-A.html.ini deleted file mode 100644 index 13e929a9514..00000000000 --- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-A.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[quickCheckAPI-A.html] - type: testharness - [WebGL test #0: testValidArgs] - expected: FAIL - diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-D_G.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-D_G.html.ini deleted file mode 100644 index f8a8a99bd7a..00000000000 --- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-D_G.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[quickCheckAPI-D_G.html] - type: testharness - [WebGL test #0: testValidArgs] - expected: FAIL - diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/programs/program-test.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/programs/program-test.html.ini index e1ca38110b6..a5f39d42b57 100644 --- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/programs/program-test.html.ini +++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/programs/program-test.html.ini @@ -1,9 +1,19 @@ [program-test.html] - type: testharness - expected: ERROR - [WebGL test #17: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] + [WebGL test #53: getError expected: INVALID_OPERATION. Was NO_ERROR : drawing with a null program should generate INVALID_OPERATION] expected: FAIL - [WebGL test #21: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] + [WebGL test #58: linking should fail with in-use formerly good program, with new bad shader attached] + expected: FAIL + + [WebGL test #64: getError expected: NO_ERROR. Was INVALID_OPERATION : delete the current program shouldn't change the current rendering state] + expected: FAIL + + [WebGL test #65: getError expected: NO_ERROR. Was INVALID_OPERATION : The current program shouldn't be deleted] + expected: FAIL + + [WebGL test #69: an attached shader shouldn't be deleted] + expected: FAIL + + [WebGL test #70: getError expected: INVALID_VALUE. Was INVALID_OPERATION : a delete-marked program should be deleted once it's no longer the current program] expected: FAIL diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/state/gl-object-get-calls.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/state/gl-object-get-calls.html.ini index fa37c3d4ea7..e71391de813 100644 --- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/state/gl-object-get-calls.html.ini +++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/state/gl-object-get-calls.html.ini @@ -1,9 +1,29 @@ [gl-object-get-calls.html] - type: testharness expected: ERROR - [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] + [WebGL test #33: gl.getRenderbufferParameter(gl.RENDERBUFFER, gl.RENDERBUFFER_WIDTH) should be 2. Threw exception TypeError: gl.getRenderbufferParameter is not a function] expected: FAIL - [Untitled] + [WebGL test #34: gl.getRenderbufferParameter(gl.RENDERBUFFER, gl.RENDERBUFFER_HEIGHT) should be 2. Threw exception TypeError: gl.getRenderbufferParameter is not a function] + expected: FAIL + + [WebGL test #35: gl.getRenderbufferParameter(gl.RENDERBUFFER, gl.RENDERBUFFER_INTERNAL_FORMAT) should be non-zero. Threw exception TypeError: gl.getRenderbufferParameter is not a function] + expected: FAIL + + [WebGL test #36: gl.getRenderbufferParameter(gl.RENDERBUFFER, gl.RENDERBUFFER_DEPTH_SIZE) should be non-zero. Threw exception TypeError: gl.getRenderbufferParameter is not a function] + expected: FAIL + + [WebGL test #39: gl.getRenderbufferParameter(gl.RENDERBUFFER, gl.RENDERBUFFER_RED_SIZE) should be non-zero. Threw exception TypeError: gl.getRenderbufferParameter is not a function] + expected: FAIL + + [WebGL test #40: gl.getRenderbufferParameter(gl.RENDERBUFFER, gl.RENDERBUFFER_GREEN_SIZE) should be non-zero. Threw exception TypeError: gl.getRenderbufferParameter is not a function] + expected: FAIL + + [WebGL test #41: gl.getRenderbufferParameter(gl.RENDERBUFFER, gl.RENDERBUFFER_BLUE_SIZE) should be non-zero. Threw exception TypeError: gl.getRenderbufferParameter is not a function] + expected: FAIL + + [WebGL test #42: gl.getRenderbufferParameter(gl.RENDERBUFFER, gl.RENDERBUFFER_ALPHA_SIZE) should be non-zero. Threw exception TypeError: gl.getRenderbufferParameter is not a function] + expected: FAIL + + [WebGL test #43: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] expected: FAIL diff --git a/tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/context/methods-2.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/context/methods-2.html.ini index fa30add16ed..c45573d2192 100644 --- a/tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/context/methods-2.html.ini +++ b/tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/context/methods-2.html.ini @@ -1,277 +1,274 @@ [methods-2.html] - [WebGL test #0: Property either does not exist or is not a function: getAttachedShaders] + [WebGL test #0: Property either does not exist or is not a function: getRenderbufferParameter] expected: FAIL - [WebGL test #1: Property either does not exist or is not a function: getRenderbufferParameter] + [WebGL test #1: Property either does not exist or is not a function: getUniform] expected: FAIL - [WebGL test #2: Property either does not exist or is not a function: getUniform] + [WebGL test #2: Property either does not exist or is not a function: isContextLost] expected: FAIL - [WebGL test #3: Property either does not exist or is not a function: isContextLost] + [WebGL test #3: Property either does not exist or is not a function: getBufferSubData] expected: FAIL - [WebGL test #4: Property either does not exist or is not a function: getBufferSubData] + [WebGL test #4: Property either does not exist or is not a function: copyBufferSubData] expected: FAIL - [WebGL test #5: Property either does not exist or is not a function: copyBufferSubData] + [WebGL test #5: Property either does not exist or is not a function: blitFramebuffer] expected: FAIL - [WebGL test #6: Property either does not exist or is not a function: blitFramebuffer] + [WebGL test #6: Property either does not exist or is not a function: framebufferTextureLayer] expected: FAIL - [WebGL test #7: Property either does not exist or is not a function: framebufferTextureLayer] + [WebGL test #7: Property either does not exist or is not a function: getInternalformatParameter] expected: FAIL - [WebGL test #8: Property either does not exist or is not a function: getInternalformatParameter] + [WebGL test #8: Property either does not exist or is not a function: invalidateFramebuffer] expected: FAIL - [WebGL test #9: Property either does not exist or is not a function: invalidateFramebuffer] + [WebGL test #9: Property either does not exist or is not a function: invalidateSubFramebuffer] expected: FAIL - [WebGL test #10: Property either does not exist or is not a function: invalidateSubFramebuffer] + [WebGL test #10: Property either does not exist or is not a function: readBuffer] expected: FAIL - [WebGL test #11: Property either does not exist or is not a function: readBuffer] + [WebGL test #11: Property either does not exist or is not a function: renderbufferStorageMultisample] expected: FAIL - [WebGL test #12: Property either does not exist or is not a function: renderbufferStorageMultisample] + [WebGL test #12: Property either does not exist or is not a function: texImage3D] expected: FAIL - [WebGL test #13: Property either does not exist or is not a function: texImage3D] + [WebGL test #13: Property either does not exist or is not a function: texStorage2D] expected: FAIL - [WebGL test #14: Property either does not exist or is not a function: texStorage2D] + [WebGL test #14: Property either does not exist or is not a function: texStorage3D] expected: FAIL - [WebGL test #15: Property either does not exist or is not a function: texStorage3D] + [WebGL test #15: Property either does not exist or is not a function: texSubImage3D] expected: FAIL - [WebGL test #16: Property either does not exist or is not a function: texSubImage3D] + [WebGL test #16: Property either does not exist or is not a function: copyTexSubImage3D] expected: FAIL - [WebGL test #17: Property either does not exist or is not a function: copyTexSubImage3D] + [WebGL test #17: Property either does not exist or is not a function: compressedTexImage3D] expected: FAIL - [WebGL test #18: Property either does not exist or is not a function: compressedTexImage3D] + [WebGL test #18: Property either does not exist or is not a function: compressedTexSubImage3D] expected: FAIL - [WebGL test #19: Property either does not exist or is not a function: compressedTexSubImage3D] + [WebGL test #19: Property either does not exist or is not a function: getFragDataLocation] expected: FAIL - [WebGL test #20: Property either does not exist or is not a function: getFragDataLocation] + [WebGL test #20: Property either does not exist or is not a function: uniform1ui] expected: FAIL - [WebGL test #21: Property either does not exist or is not a function: uniform1ui] + [WebGL test #21: Property either does not exist or is not a function: uniform2ui] expected: FAIL - [WebGL test #22: Property either does not exist or is not a function: uniform2ui] + [WebGL test #22: Property either does not exist or is not a function: uniform3ui] expected: FAIL - [WebGL test #23: Property either does not exist or is not a function: uniform3ui] + [WebGL test #23: Property either does not exist or is not a function: uniform4ui] expected: FAIL - [WebGL test #24: Property either does not exist or is not a function: uniform4ui] + [WebGL test #24: Property either does not exist or is not a function: uniform1uiv] expected: FAIL - [WebGL test #25: Property either does not exist or is not a function: uniform1uiv] + [WebGL test #25: Property either does not exist or is not a function: uniform2uiv] expected: FAIL - [WebGL test #26: Property either does not exist or is not a function: uniform2uiv] + [WebGL test #26: Property either does not exist or is not a function: uniform3uiv] expected: FAIL - [WebGL test #27: Property either does not exist or is not a function: uniform3uiv] + [WebGL test #27: Property either does not exist or is not a function: uniform4uiv] expected: FAIL - [WebGL test #28: Property either does not exist or is not a function: uniform4uiv] + [WebGL test #28: Property either does not exist or is not a function: uniformMatrix2x3fv] expected: FAIL - [WebGL test #29: Property either does not exist or is not a function: uniformMatrix2x3fv] + [WebGL test #29: Property either does not exist or is not a function: uniformMatrix3x2fv] expected: FAIL - [WebGL test #30: Property either does not exist or is not a function: uniformMatrix3x2fv] + [WebGL test #30: Property either does not exist or is not a function: uniformMatrix2x4fv] expected: FAIL - [WebGL test #31: Property either does not exist or is not a function: uniformMatrix2x4fv] + [WebGL test #31: Property either does not exist or is not a function: uniformMatrix4x2fv] expected: FAIL - [WebGL test #32: Property either does not exist or is not a function: uniformMatrix4x2fv] + [WebGL test #32: Property either does not exist or is not a function: uniformMatrix3x4fv] expected: FAIL - [WebGL test #33: Property either does not exist or is not a function: uniformMatrix3x4fv] + [WebGL test #33: Property either does not exist or is not a function: uniformMatrix4x3fv] expected: FAIL - [WebGL test #34: Property either does not exist or is not a function: uniformMatrix4x3fv] + [WebGL test #34: Property either does not exist or is not a function: vertexAttribI4i] expected: FAIL - [WebGL test #35: Property either does not exist or is not a function: vertexAttribI4i] + [WebGL test #35: Property either does not exist or is not a function: vertexAttribI4iv] expected: FAIL - [WebGL test #36: Property either does not exist or is not a function: vertexAttribI4iv] + [WebGL test #36: Property either does not exist or is not a function: vertexAttribI4ui] expected: FAIL - [WebGL test #37: Property either does not exist or is not a function: vertexAttribI4ui] + [WebGL test #37: Property either does not exist or is not a function: vertexAttribI4uiv] expected: FAIL - [WebGL test #38: Property either does not exist or is not a function: vertexAttribI4uiv] + [WebGL test #38: Property either does not exist or is not a function: vertexAttribIPointer] expected: FAIL - [WebGL test #39: Property either does not exist or is not a function: vertexAttribIPointer] + [WebGL test #39: Property either does not exist or is not a function: vertexAttribDivisor] expected: FAIL - [WebGL test #40: Property either does not exist or is not a function: vertexAttribDivisor] + [WebGL test #40: Property either does not exist or is not a function: drawArraysInstanced] expected: FAIL - [WebGL test #41: Property either does not exist or is not a function: drawArraysInstanced] + [WebGL test #41: Property either does not exist or is not a function: drawElementsInstanced] expected: FAIL - [WebGL test #42: Property either does not exist or is not a function: drawElementsInstanced] + [WebGL test #42: Property either does not exist or is not a function: drawRangeElements] expected: FAIL - [WebGL test #43: Property either does not exist or is not a function: drawRangeElements] + [WebGL test #43: Property either does not exist or is not a function: drawBuffers] expected: FAIL - [WebGL test #44: Property either does not exist or is not a function: drawBuffers] + [WebGL test #44: Property either does not exist or is not a function: clearBufferiv] expected: FAIL - [WebGL test #45: Property either does not exist or is not a function: clearBufferiv] + [WebGL test #45: Property either does not exist or is not a function: clearBufferuiv] expected: FAIL - [WebGL test #46: Property either does not exist or is not a function: clearBufferuiv] + [WebGL test #46: Property either does not exist or is not a function: clearBufferfv] expected: FAIL - [WebGL test #47: Property either does not exist or is not a function: clearBufferfv] + [WebGL test #47: Property either does not exist or is not a function: clearBufferfi] expected: FAIL - [WebGL test #48: Property either does not exist or is not a function: clearBufferfi] + [WebGL test #48: Property either does not exist or is not a function: createQuery] expected: FAIL - [WebGL test #49: Property either does not exist or is not a function: createQuery] + [WebGL test #49: Property either does not exist or is not a function: deleteQuery] expected: FAIL - [WebGL test #50: Property either does not exist or is not a function: deleteQuery] + [WebGL test #50: Property either does not exist or is not a function: isQuery] expected: FAIL - [WebGL test #51: Property either does not exist or is not a function: isQuery] + [WebGL test #51: Property either does not exist or is not a function: beginQuery] expected: FAIL - [WebGL test #52: Property either does not exist or is not a function: beginQuery] + [WebGL test #52: Property either does not exist or is not a function: endQuery] expected: FAIL - [WebGL test #53: Property either does not exist or is not a function: endQuery] + [WebGL test #53: Property either does not exist or is not a function: getQuery] expected: FAIL - [WebGL test #54: Property either does not exist or is not a function: getQuery] + [WebGL test #54: Property either does not exist or is not a function: getQueryParameter] expected: FAIL - [WebGL test #55: Property either does not exist or is not a function: getQueryParameter] + [WebGL test #55: Property either does not exist or is not a function: createSampler] expected: FAIL - [WebGL test #56: Property either does not exist or is not a function: createSampler] + [WebGL test #56: Property either does not exist or is not a function: deleteSampler] expected: FAIL - [WebGL test #57: Property either does not exist or is not a function: deleteSampler] + [WebGL test #57: Property either does not exist or is not a function: isSampler] expected: FAIL - [WebGL test #58: Property either does not exist or is not a function: isSampler] + [WebGL test #58: Property either does not exist or is not a function: bindSampler] expected: FAIL - [WebGL test #59: Property either does not exist or is not a function: bindSampler] + [WebGL test #59: Property either does not exist or is not a function: samplerParameteri] expected: FAIL - [WebGL test #60: Property either does not exist or is not a function: samplerParameteri] + [WebGL test #60: Property either does not exist or is not a function: samplerParameterf] expected: FAIL - [WebGL test #61: Property either does not exist or is not a function: samplerParameterf] + [WebGL test #61: Property either does not exist or is not a function: getSamplerParameter] expected: FAIL - [WebGL test #62: Property either does not exist or is not a function: getSamplerParameter] + [WebGL test #62: Property either does not exist or is not a function: fenceSync] expected: FAIL - [WebGL test #63: Property either does not exist or is not a function: fenceSync] + [WebGL test #63: Property either does not exist or is not a function: isSync] expected: FAIL - [WebGL test #64: Property either does not exist or is not a function: isSync] + [WebGL test #64: Property either does not exist or is not a function: deleteSync] expected: FAIL - [WebGL test #65: Property either does not exist or is not a function: deleteSync] + [WebGL test #65: Property either does not exist or is not a function: clientWaitSync] expected: FAIL - [WebGL test #66: Property either does not exist or is not a function: clientWaitSync] + [WebGL test #66: Property either does not exist or is not a function: waitSync] expected: FAIL - [WebGL test #67: Property either does not exist or is not a function: waitSync] + [WebGL test #67: Property either does not exist or is not a function: getSyncParameter] expected: FAIL - [WebGL test #68: Property either does not exist or is not a function: getSyncParameter] + [WebGL test #68: Property either does not exist or is not a function: createTransformFeedback] expected: FAIL - [WebGL test #69: Property either does not exist or is not a function: createTransformFeedback] + [WebGL test #69: Property either does not exist or is not a function: deleteTransformFeedback] expected: FAIL - [WebGL test #70: Property either does not exist or is not a function: deleteTransformFeedback] + [WebGL test #70: Property either does not exist or is not a function: isTransformFeedback] expected: FAIL - [WebGL test #71: Property either does not exist or is not a function: isTransformFeedback] + [WebGL test #71: Property either does not exist or is not a function: bindTransformFeedback] expected: FAIL - [WebGL test #72: Property either does not exist or is not a function: bindTransformFeedback] + [WebGL test #72: Property either does not exist or is not a function: beginTransformFeedback] expected: FAIL - [WebGL test #73: Property either does not exist or is not a function: beginTransformFeedback] + [WebGL test #73: Property either does not exist or is not a function: endTransformFeedback] expected: FAIL - [WebGL test #74: Property either does not exist or is not a function: endTransformFeedback] + [WebGL test #74: Property either does not exist or is not a function: transformFeedbackVaryings] expected: FAIL - [WebGL test #75: Property either does not exist or is not a function: transformFeedbackVaryings] + [WebGL test #75: Property either does not exist or is not a function: getTransformFeedbackVarying] expected: FAIL - [WebGL test #76: Property either does not exist or is not a function: getTransformFeedbackVarying] + [WebGL test #76: Property either does not exist or is not a function: pauseTransformFeedback] expected: FAIL - [WebGL test #77: Property either does not exist or is not a function: pauseTransformFeedback] + [WebGL test #77: Property either does not exist or is not a function: resumeTransformFeedback] expected: FAIL - [WebGL test #78: Property either does not exist or is not a function: resumeTransformFeedback] + [WebGL test #78: Property either does not exist or is not a function: bindBufferBase] expected: FAIL - [WebGL test #79: Property either does not exist or is not a function: bindBufferBase] + [WebGL test #79: Property either does not exist or is not a function: bindBufferRange] expected: FAIL - [WebGL test #80: Property either does not exist or is not a function: bindBufferRange] + [WebGL test #80: Property either does not exist or is not a function: getIndexedParameter] expected: FAIL - [WebGL test #81: Property either does not exist or is not a function: getIndexedParameter] + [WebGL test #81: Property either does not exist or is not a function: getUniformIndices] expected: FAIL - [WebGL test #82: Property either does not exist or is not a function: getUniformIndices] + [WebGL test #82: Property either does not exist or is not a function: getActiveUniforms] expected: FAIL - [WebGL test #83: Property either does not exist or is not a function: getActiveUniforms] + [WebGL test #83: Property either does not exist or is not a function: getUniformBlockIndex] expected: FAIL - [WebGL test #84: Property either does not exist or is not a function: getUniformBlockIndex] + [WebGL test #84: Property either does not exist or is not a function: getActiveUniformBlockParameter] expected: FAIL - [WebGL test #85: Property either does not exist or is not a function: getActiveUniformBlockParameter] + [WebGL test #85: Property either does not exist or is not a function: getActiveUniformBlockName] expected: FAIL - [WebGL test #86: Property either does not exist or is not a function: getActiveUniformBlockName] + [WebGL test #86: Property either does not exist or is not a function: uniformBlockBinding] expected: FAIL - [WebGL test #87: Property either does not exist or is not a function: uniformBlockBinding] + [WebGL test #87: Property either does not exist or is not a function: createVertexArray] expected: FAIL - [WebGL test #88: Property either does not exist or is not a function: createVertexArray] + [WebGL test #88: Property either does not exist or is not a function: deleteVertexArray] expected: FAIL - [WebGL test #89: Property either does not exist or is not a function: deleteVertexArray] + [WebGL test #89: Property either does not exist or is not a function: isVertexArray] expected: FAIL - [WebGL test #90: Property either does not exist or is not a function: isVertexArray] - expected: FAIL - - [WebGL test #91: Property either does not exist or is not a function: bindVertexArray] + [WebGL test #90: Property either does not exist or is not a function: bindVertexArray] expected: FAIL diff --git a/tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/state/gl-object-get-calls.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/state/gl-object-get-calls.html.ini index e283ec2b7de..de7464b81dd 100644 --- a/tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/state/gl-object-get-calls.html.ini +++ b/tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/state/gl-object-get-calls.html.ini @@ -1,2 +1,110 @@ [gl-object-get-calls.html] - expected: CRASH + expected: ERROR + [WebGL test #6: gl.getBufferParameter(gl.COPY_READ_BUFFER, gl.BUFFER_SIZE) should be 16 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #7: gl.getBufferParameter(gl.COPY_READ_BUFFER, gl.BUFFER_USAGE) should be 35048 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #9: gl.getBufferParameter(gl.COPY_WRITE_BUFFER, gl.BUFFER_SIZE) should be 16 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #10: gl.getBufferParameter(gl.COPY_WRITE_BUFFER, gl.BUFFER_USAGE) should be 35048 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #12: gl.getBufferParameter(gl.PIXEL_PACK_BUFFER, gl.BUFFER_SIZE) should be 16 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #13: gl.getBufferParameter(gl.PIXEL_PACK_BUFFER, gl.BUFFER_USAGE) should be 35048 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #15: gl.getBufferParameter(gl.PIXEL_UNPACK_BUFFER, gl.BUFFER_SIZE) should be 16 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #16: gl.getBufferParameter(gl.PIXEL_UNPACK_BUFFER, gl.BUFFER_USAGE) should be 35048 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #18: gl.getBufferParameter(gl.TRANSFORM_FEEDBACK_BUFFER, gl.BUFFER_SIZE) should be 16 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #19: gl.getBufferParameter(gl.TRANSFORM_FEEDBACK_BUFFER, gl.BUFFER_USAGE) should be 35048 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #21: gl.getBufferParameter(gl.UNIFORM_BUFFER, gl.BUFFER_SIZE) should be 16 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #22: gl.getBufferParameter(gl.UNIFORM_BUFFER, gl.BUFFER_USAGE) should be 35048 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #26: getError expected: NO_ERROR. Was INVALID_ENUM : ] + expected: FAIL + + [WebGL test #28: getError expected: NO_ERROR. Was INVALID_ENUM : ] + expected: FAIL + + [WebGL test #29: gl.checkFramebufferStatus(gl.FRAMEBUFFER) should be 36053. Was 36061.] + expected: FAIL + + [WebGL test #35: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.DEPTH_STENCIL_ATTACHMENT, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) should be [object WebGLRenderbuffer\]. Was null.] + expected: FAIL + + [WebGL test #42: getError expected: INVALID_OPERATION. Was INVALID_ENUM : after evaluating: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.DEPTH_STENCIL_ATTACHMENT, gl.FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE)] + expected: FAIL + + [WebGL test #48: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.BACK, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE) should be 33304 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #49: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.DEPTH, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE) should be 33304 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #50: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.STENCIL, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE) should be 33304 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #63: getError expected: NO_ERROR. Was INVALID_OPERATION : ] + expected: FAIL + + [WebGL test #64: getFramebufferAttachmentParameter did not generate INVALID_ENUM for invalid parameter enum: NO_ERROR] + expected: FAIL + + [WebGL test #65: getFramebufferAttachmentParameter did not generate INVALID_ENUM for invalid target enum: NO_ERROR] + expected: FAIL + + [WebGL test #66: getFramebufferAttachmentParameter did not generate INVALID_ENUM for invalid attachment enum: NO_ERROR] + expected: FAIL + + [WebGL test #67: getError expected: NO_ERROR. Was INVALID_ENUM : ] + expected: FAIL + + [WebGL test #69: getError expected: NO_ERROR. Was INVALID_ENUM : ] + expected: FAIL + + [WebGL test #70: gl.checkFramebufferStatus(gl.FRAMEBUFFER) should be 36053. Was 36061.] + expected: FAIL + + [WebGL test #76: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.DEPTH_STENCIL_ATTACHMENT, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) should be [object WebGLRenderbuffer\]. Was null.] + expected: FAIL + + [WebGL test #83: getError expected: INVALID_OPERATION. Was INVALID_ENUM : after evaluating: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.DEPTH_STENCIL_ATTACHMENT, gl.FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE)] + expected: FAIL + + [WebGL test #89: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.BACK, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE) should be 33304 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #90: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.DEPTH, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE) should be 33304 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #91: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.STENCIL, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE) should be 0 (of type number). Was null (of type object).] + expected: FAIL + + [WebGL test #104: getFramebufferAttachmentParameter did not generate INVALID_ENUM for invalid parameter enum: NO_ERROR] + expected: FAIL + + [WebGL test #105: getFramebufferAttachmentParameter did not generate INVALID_ENUM for invalid target enum: NO_ERROR] + expected: FAIL + + [WebGL test #106: getFramebufferAttachmentParameter did not generate INVALID_ENUM for invalid attachment enum: NO_ERROR] + expected: FAIL + + [WebGL test #121: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] + expected: FAIL +