Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-08 00:23:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support for WebGL2 GetFragDataLocation

Browse source 
Adds support for the `GetFragDataLocation` WebGL2 call.

See: https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.7
This commit is contained in:
Mátyás Mustoha 2020-03-06 11:42:21 +01:00
parent e1f6dfd716
commit ced67af6b2
9 changed files with 62 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -5490,9 +5490,9 @@ dependencies = [
[[package]]
name = "sparkle"
version = "0.1.20"
version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc89be71cc02b59fdb05edd5589aac8e7542356f815adf84851f8142938f6534"
checksum = "34a99c8f866b15ebf845b1957a244e033f434346f648620c645d95a05b00c0af"
dependencies = [
"gl_generator 0.13.1",
]

2
components/canvas/Cargo.toml
View file

@ -35,7 +35,7 @@ raqote = {git = "https://github.com/jrmuizel/raqote"}
time = { version = "0.1.0", optional = true }
pixels = {path = "../pixels"}
servo_config = {path = "../config"}
sparkle = "0.1.20"
sparkle = "0.1.22"
webrender = {git = "https://github.com/servo/webrender"}
webrender_api = {git = "https://github.com/servo/webrender"}
webrender_traits = {path = "../webrender_traits"}

6
components/canvas/webgl_thread.rs
View file

@ -1287,6 +1287,12 @@ impl WebGLImpl {
Self::shader_precision_format(gl, shader_type, precision_type, chan)
},
WebGLCommand::GetExtensions(ref chan) => Self::get_extensions(gl, chan),
WebGLCommand::GetFragDataLocation(program_id, ref name, ref sender) => {
let location =
gl.get_frag_data_location(program_id.get(), &to_name_in_compiled_shader(name));
assert!(location >= 0);
sender.send(location).unwrap();
},
WebGLCommand::GetUniformLocation(program_id, ref name, ref chan) => {
Self::uniform_location(gl, program_id, &name, chan)
},

1
components/canvas_traits/webgl.rs
View file

@ -305,6 +305,7 @@ pub enum WebGLCommand {
FramebufferTexture2D(u32, u32, u32, Option<WebGLTextureId>, i32),
GetExtensions(WebGLSender<String>),
GetShaderPrecisionFormat(u32, u32, WebGLSender<(i32, i32, i32)>),
GetFragDataLocation(WebGLProgramId, String, WebGLSender<i32>),
GetUniformLocation(WebGLProgramId, String, WebGLSender<i32>),
GetShaderInfoLog(WebGLShaderId, WebGLSender<String>),
GetProgramInfoLog(WebGLProgramId, WebGLSender<String>),

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

@ -1467,6 +1467,12 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
self.base.GetAttribLocation(program, name)
}
/// https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.7
fn GetFragDataLocation(&self, program: &WebGLProgram, name: DOMString) -> i32 {
handle_potential_webgl_error!(self.base, self.base.validate_ownership(program), return -1);
handle_potential_webgl_error!(self.base, program.get_frag_data_location(name), -1)
}
/// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9
fn GetProgramInfoLog(&self, program: &WebGLProgram) -> Option<DOMString> {
self.base.GetProgramInfoLog(program)

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

@ -365,6 +365,30 @@ impl WebGLProgram {
Ok(location)
}
/// glGetFragDataLocation
pub fn get_frag_data_location(&self, name: DOMString) -> WebGLResult<i32> {
if !self.is_linked() || self.is_deleted() {
return Err(WebGLError::InvalidOperation);
}
if !validate_glsl_name(&name)? {
return Ok(-1);
}
if name.starts_with("gl_") {
return Ok(-1);
}
let (sender, receiver) = webgl_channel().unwrap();
self.upcast::<WebGLObject>()
.context()
.send_command(WebGLCommand::GetFragDataLocation(
self.id,
name.into(),
sender,
));
Ok(receiver.recv().unwrap())
}
/// glGetUniformLocation
pub fn get_uniform_location(
&self,

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

@ -422,7 +422,7 @@ interface mixin WebGL2RenderingContextBase
// optional GLuint srcLengthOverride = 0);
/* Programs and shaders */
// [WebGLHandlesContextLoss] GLint getFragDataLocation(WebGLProgram program, DOMString name);
[WebGLHandlesContextLoss] GLint getFragDataLocation(WebGLProgram program, DOMString name);
/* Uniforms */
void uniform1ui(WebGLUniformLocation? location, GLuint v0);

45
tests/wpt/webgl/meta/conformance2/context/methods-2.html.ini
View file

@ -1,17 +1,20 @@
[methods-2.html]
[WebGL test #19: Property either does not exist or is not a function: getIndexedParameter]
expected: FAIL
[WebGL test #11: Property either does not exist or is not a function: compressedTexSubImage3D]
expected: FAIL
[WebGL test #8: Property either does not exist or is not a function: texSubImage3D]
expected: FAIL
[WebGL test #14: Property either does not exist or is not a function: vertexAttribI4iv]
[WebGL test #14: Property either does not exist or is not a function: vertexAttribI4ui]
expected: FAIL
[WebGL test #15: Property either does not exist or is not a function: vertexAttribI4ui]
[WebGL test #18: Property either does not exist or is not a function: drawBuffers]
expected: FAIL
[WebGL test #22: Property either does not exist or is not a function: deleteVertexArray]
[WebGL test #12: Property either does not exist or is not a function: vertexAttribI4i]
expected: FAIL
[WebGL test #6: Property either does not exist or is not a function: texStorage2D]
@ -20,19 +23,13 @@
[WebGL test #1: Property either does not exist or is not a function: blitFramebuffer]
expected: FAIL
[WebGL test #13: Property either does not exist or is not a function: vertexAttribI4i]
expected: FAIL
[WebGL test #5: Property either does not exist or is not a function: texImage3D]
expected: FAIL
[WebGL test #4: Property either does not exist or is not a function: renderbufferStorageMultisample]
[WebGL test #17: Property either does not exist or is not a function: drawRangeElements]
expected: FAIL
[WebGL test #20: Property either does not exist or is not a function: getIndexedParameter]
expected: FAIL
[WebGL test #19: Property either does not exist or is not a function: drawBuffers]
[WebGL test #21: Property either does not exist or is not a function: deleteVertexArray]
expected: FAIL
[WebGL test #10: Property either does not exist or is not a function: compressedTexImage3D]
@ -41,10 +38,10 @@
[WebGL test #7: Property either does not exist or is not a function: texStorage3D]
expected: FAIL
[WebGL test #16: Property either does not exist or is not a function: vertexAttribI4uiv]
[WebGL test #22: Property either does not exist or is not a function: isVertexArray]
expected: FAIL
[WebGL test #18: Property either does not exist or is not a function: drawRangeElements]
[WebGL test #4: Property either does not exist or is not a function: renderbufferStorageMultisample]
expected: FAIL
[WebGL test #9: Property either does not exist or is not a function: copyTexSubImage3D]
@ -53,7 +50,16 @@
[WebGL test #0: Property either does not exist or is not a function: isContextLost]
expected: FAIL
[WebGL test #17: Property either does not exist or is not a function: vertexAttribIPointer]
[WebGL test #20: Property either does not exist or is not a function: createVertexArray]
expected: FAIL
[WebGL test #23: Property either does not exist or is not a function: bindVertexArray]
expected: FAIL
[WebGL test #16: Property either does not exist or is not a function: vertexAttribIPointer]
expected: FAIL
[WebGL test #15: Property either does not exist or is not a function: vertexAttribI4uiv]
expected: FAIL
[WebGL test #2: Property either does not exist or is not a function: getInternalformatParameter]
@ -62,15 +68,6 @@
[WebGL test #3: Property either does not exist or is not a function: readBuffer]
expected: FAIL
[WebGL test #21: Property either does not exist or is not a function: createVertexArray]
expected: FAIL
[WebGL test #12: Property either does not exist or is not a function: getFragDataLocation]
expected: FAIL
[WebGL test #24: Property either does not exist or is not a function: bindVertexArray]
expected: FAIL
[WebGL test #23: Property either does not exist or is not a function: isVertexArray]
[WebGL test #13: Property either does not exist or is not a function: vertexAttribI4iv]
expected: FAIL

4
tests/wpt/webgl/meta/conformance2/programs/gl-get-frag-data-location.html.ini
View file

@ -1,4 +0,0 @@
[gl-get-frag-data-location.html]
expected: ERROR
[WebGL test #2: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
expected: FAIL