Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #20411 - servo:webgl, r=emilio

Browse source 
Implement WebGLRenderingContextBase.getAttachedShaders

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20411)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-03-24 10:25:35 -04:00 • committed by GitHub
commit 2ab34d5969
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 385 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/webgl2renderingcontext.rs
View file

@ -974,6 +974,14 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
level: i32) { level: i32) {
self.base.FramebufferTexture2D(target, attachment, textarget, texture, level) 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<Vec<DomRoot<WebGLShader>>> {
self.base.GetAttachedShaders(program)
}
} }

13
components/script/dom/webglprogram.rs
View file

@ -367,6 +367,19 @@ impl WebGLProgram {
self.renderer.send(WebGLCommand::GetProgramParameter(self.id, param_id, sender)).unwrap(); self.renderer.send(WebGLCommand::GetProgramParameter(self.id, param_id, sender)).unwrap();
receiver.recv().unwrap() receiver.recv().unwrap()
} }
pub fn attached_shaders(&self) -> WebGLResult<Vec<DomRoot<WebGLShader>>> {
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 { impl Drop for WebGLProgram {

51
components/script/dom/webglrenderingcontext.rs
View file

@ -1237,21 +1237,41 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
#[allow(unsafe_code)] #[allow(unsafe_code)]
// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5 // 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 { unsafe fn GetBufferParameter(
let parameter_matches = match parameter { &self,
constants::BUFFER_SIZE | _cx: *mut JSContext,
constants::BUFFER_USAGE => true, target: u32,
_ => false, 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 { if parameter == constants::BUFFER_SIZE {
self.webgl_error(InvalidEnum); return Int32Value(buffer.capacity() as i32);
return NullValue();
} }
let (sender, receiver) = webgl_channel().unwrap(); let (sender, receiver) = webgl_channel().unwrap();
self.send_command(WebGLCommand::GetBufferParameter(target, parameter, sender)); self.send_command(WebGLCommand::GetBufferParameter(target, parameter, sender));
Int32Value(receiver.recv().unwrap()) 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 // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9
fn CompileShader(&self, shader: &WebGLShader) { 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 // 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), None => self.webgl_error(InvalidOperation),
}; };
} }
/// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9
fn GetAttachedShaders(
&self,
program: &WebGLProgram,
) -> Option<Vec<DomRoot<WebGLShader>>> {
handle_potential_webgl_error!(self, program.attached_shaders().map(Some), None)
}
} }
pub trait LayoutCanvasWebGLRenderingContextHelpers { pub trait LayoutCanvasWebGLRenderingContextHelpers {

139
components/script/dom/webglshader.rs
View file

@ -3,8 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// https://www.khronos.org/registry/webgl/specs/latest/1.0/webgl.idl // https://www.khronos.org/registry/webgl/specs/latest/1.0/webgl.idl
use canvas_traits::webgl::{WebGLSLVersion, WebGLVersion}; use canvas_traits::webgl::{WebGLCommand, WebGLError, WebGLMsgSender};
use canvas_traits::webgl::{webgl_channel, WebGLCommand, WebGLMsgSender, WebGLParameter, WebGLResult, WebGLShaderId}; use canvas_traits::webgl::{WebGLParameter, WebGLResult, WebGLSLVersion};
use canvas_traits::webgl::{WebGLShaderId, WebGLVersion, webgl_channel};
use dom::bindings::cell::DomRefCell; use dom::bindings::cell::DomRefCell;
use dom::bindings::codegen::Bindings::WebGLShaderBinding; use dom::bindings::codegen::Bindings::WebGLShaderBinding;
use dom::bindings::reflector::reflect_dom_object; use dom::bindings::reflector::reflect_dom_object;
@ -98,74 +99,83 @@ impl WebGLShader {
&self, &self,
webgl_version: WebGLVersion, webgl_version: WebGLVersion,
glsl_version: WebGLSLVersion, 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 { if self.compilation_status.get() != ShaderCompilationStatus::NotCompiled {
debug!("Compiling already compiled shader {}", self.id); debug!("Compiling already compiled shader {}", self.id);
} }
if let Some(ref source) = *self.source.borrow() { let source = self.source.borrow();
let mut params = BuiltInResources::default(); let source = match source.as_ref() {
params.FragmentPrecisionHigh = 1; Some(source) => source,
params.OES_standard_derivatives = ext.is_enabled::<OESStandardDerivatives>() as i32; None => return Ok(()),
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,
&params).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,
&params).unwrap()
},
};
match validator.compile_and_translate(&[source]) { let mut params = BuiltInResources::default();
Ok(translated_source) => { params.FragmentPrecisionHigh = 1;
debug!("Shader translated: {}", translated_source); params.OES_standard_derivatives = ext.is_enabled::<OESStandardDerivatives>() as i32;
// NOTE: At this point we should be pretty sure that the compilation in the paint thread let validator = match webgl_version {
// will succeed. WebGLVersion::WebGL1 => {
// It could be interesting to retrieve the info log from the paint thread though let output_format = if cfg!(any(target_os = "android", target_os = "ios")) {
let msg = WebGLCommand::CompileShader(self.id, translated_source); Output::Essl
self.renderer.send(msg).unwrap(); } else {
self.compilation_status.set(ShaderCompilationStatus::Succeeded); Output::Glsl
}, };
Err(error) => { ShaderValidator::for_webgl(self.gl_type,
self.compilation_status.set(ShaderCompilationStatus::Failed); output_format,
debug!("Shader {} compilation failed: {}", self.id, error); &params).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,
&params).unwrap()
},
};
*self.info_log.borrow_mut() = Some(validator.info_log()); match validator.compile_and_translate(&[source]) {
// TODO(emilio): More data (like uniform data) should be collected Ok(translated_source) => {
// here to properly validate uniforms. debug!("Shader translated: {}", translated_source);
// // NOTE: At this point we should be pretty sure that the compilation in the paint thread
// This requires a more complex interface with ANGLE, using C++ // will succeed.
// bindings and being extremely cautious about destructing things. // 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) /// Mark this shader as deleted (if it wasn't previously)
@ -202,6 +212,9 @@ impl WebGLShader {
/// glGetParameter /// glGetParameter
pub fn parameter(&self, param_id: u32) -> WebGLResult<WebGLParameter> { pub fn parameter(&self, param_id: u32) -> WebGLResult<WebGLParameter> {
if self.is_deleted.get() && !self.is_attached() {
return Err(WebGLError::InvalidValue);
}
let (sender, receiver) = webgl_channel().unwrap(); let (sender, receiver) = webgl_channel().unwrap();
self.renderer.send(WebGLCommand::GetShaderParameter(self.id, param_id, sender)).unwrap(); self.renderer.send(WebGLCommand::GetShaderParameter(self.id, param_id, sender)).unwrap();
receiver.recv().unwrap() receiver.recv().unwrap()

2
components/script/dom/webidls/WebGLRenderingContext.webidl
View file

@ -563,7 +563,7 @@ interface WebGLRenderingContextBase
WebGLActiveInfo? getActiveAttrib(WebGLProgram program, GLuint index); WebGLActiveInfo? getActiveAttrib(WebGLProgram program, GLuint index);
WebGLActiveInfo? getActiveUniform(WebGLProgram program, GLuint index); WebGLActiveInfo? getActiveUniform(WebGLProgram program, GLuint index);
//sequence<WebGLShader>? getAttachedShaders(WebGLProgram? program); sequence<WebGLShader>? getAttachedShaders(WebGLProgram program);
[WebGLHandlesContextLoss] GLint getAttribLocation(WebGLProgram program, DOMString name); [WebGLHandlesContextLoss] GLint getAttribLocation(WebGLProgram program, DOMString name);

10
tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/methods.html.ini
View file

@ -1,14 +1,10 @@
[methods.html] [methods.html]
type: testharness [WebGL test #0: Property either does not exist or is not a function: getRenderbufferParameter]
[WebGL test #0: Property either does not exist or is not a function: getAttachedShaders]
expected: FAIL 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 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]
expected: FAIL expected: FAIL

8
tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/null-object-behaviour.html.ini
View file

@ -1,3 +1,7 @@
[null-object-behaviour.html] [null-object-behaviour.html]
type: testharness [WebGL test #3: getError expected: INVALID_VALUE. Was NO_ERROR : after evaluating: context.linkProgram(undefined)]
expected: CRASH 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

5
tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-A.html.ini
View file

@ -1,5 +0,0 @@
[quickCheckAPI-A.html]
type: testharness
[WebGL test #0: testValidArgs]
expected: FAIL

5
tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-D_G.html.ini
View file

@ -1,5 +0,0 @@
[quickCheckAPI-D_G.html]
type: testharness
[WebGL test #0: testValidArgs]
expected: FAIL

18
tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/programs/program-test.html.ini
View file

@ -1,9 +1,19 @@
[program-test.html] [program-test.html]
type: testharness [WebGL test #53: getError expected: INVALID_OPERATION. Was NO_ERROR : drawing with a null program should generate INVALID_OPERATION]
expected: ERROR
[WebGL test #17: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
expected: FAIL 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 expected: FAIL

26
tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/state/gl-object-get-calls.html.ini
View file

@ -1,9 +1,29 @@
[gl-object-get-calls.html] [gl-object-get-calls.html]
type: testharness
expected: ERROR 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 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 expected: FAIL

185
tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/context/methods-2.html.ini
View file

@ -1,277 +1,274 @@
[methods-2.html] [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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 expected: FAIL
[WebGL test #90: Property either does not exist or is not a function: isVertexArray] [WebGL test #90: Property either does not exist or is not a function: bindVertexArray]
expected: FAIL
[WebGL test #91: Property either does not exist or is not a function: bindVertexArray]
expected: FAIL expected: FAIL

110
tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/state/gl-object-get-calls.html.ini
View file

@ -1,2 +1,110 @@
[gl-object-get-calls.html] [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