Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Simplify GetShaderPrecisionFormat

Browse source
This commit is contained in:
Igor Gutorov 2018-03-20 21:44:08 +02:00
parent 7e5160b79e
commit bdd53f35af
3 changed files with 23 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/canvas/webgl_thread.rs
View file

@ -1156,21 +1156,8 @@ impl WebGLImpl {
fn shader_precision_format(gl: &gl::Gl, fn shader_precision_format(gl: &gl::Gl,
shader_type: u32, shader_type: u32,
precision_type: u32, precision_type: u32,
chan: WebGLSender<WebGLResult<(i32, i32, i32)>>) { chan: WebGLSender<(i32, i32, i32)>) {
let result = match precision_type { let result = gl.get_shader_precision_format(shader_type, precision_type);
gl::LOW_FLOAT |
gl::MEDIUM_FLOAT |
gl::HIGH_FLOAT |
gl::LOW_INT |
gl::MEDIUM_INT |
gl::HIGH_INT => {
Ok(gl.get_shader_precision_format(shader_type, precision_type))
},
_=> {
Err(WebGLError::InvalidEnum)
}
};
chan.send(result).unwrap(); chan.send(result).unwrap();
} }

2
components/canvas_traits/webgl.rs
View file

@ -210,7 +210,7 @@ pub enum WebGLCommand {
GetTexParameter(u32, u32, WebGLSender<i32>), GetTexParameter(u32, u32, WebGLSender<i32>),
GetProgramParameter(WebGLProgramId, u32, WebGLSender<WebGLResult<WebGLParameter>>), GetProgramParameter(WebGLProgramId, u32, WebGLSender<WebGLResult<WebGLParameter>>),
GetShaderParameter(WebGLShaderId, u32, WebGLSender<WebGLResult<WebGLParameter>>), GetShaderParameter(WebGLShaderId, u32, WebGLSender<WebGLResult<WebGLParameter>>),
GetShaderPrecisionFormat(u32, u32, WebGLSender<WebGLResult<(i32, i32, i32)>>), GetShaderPrecisionFormat(u32, u32, WebGLSender<(i32, i32, i32)>),
GetActiveAttrib(WebGLProgramId, u32, WebGLSender<WebGLResult<(i32, u32, String)>>), GetActiveAttrib(WebGLProgramId, u32, WebGLSender<WebGLResult<(i32, u32, String)>>),
GetActiveUniform(WebGLProgramId, u32, WebGLSender<WebGLResult<(i32, u32, String)>>), GetActiveUniform(WebGLProgramId, u32, WebGLSender<WebGLResult<(i32, u32, String)>>),
GetAttribLocation(WebGLProgramId, String, WebGLSender<Option<i32>>), GetAttribLocation(WebGLProgramId, String, WebGLSender<Option<i32>>),

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

@ -2357,24 +2357,31 @@ 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 GetShaderPrecisionFormat(&self, fn GetShaderPrecisionFormat(
shader_type: u32, &self,
precision_type: u32) shader_type: u32,
-> Option<DomRoot<WebGLShaderPrecisionFormat>> { precision_type: u32
) -> Option<DomRoot<WebGLShaderPrecisionFormat>> {
match precision_type {
constants::LOW_FLOAT |
constants::MEDIUM_FLOAT |
constants::HIGH_FLOAT |
constants::LOW_INT |
constants::MEDIUM_INT |
constants::HIGH_INT => (),
_ => {
self.webgl_error(InvalidEnum);
return None;
},
}
let (sender, receiver) = webgl_channel().unwrap(); let (sender, receiver) = webgl_channel().unwrap();
self.send_command(WebGLCommand::GetShaderPrecisionFormat(shader_type, self.send_command(WebGLCommand::GetShaderPrecisionFormat(shader_type,
precision_type, precision_type,
sender)); sender));
match receiver.recv().unwrap() { let (range_min, range_max, precision) = receiver.recv().unwrap();
Ok((range_min, range_max, precision)) => { Some(WebGLShaderPrecisionFormat::new(self.global().as_window(), range_min, range_max, precision))
Some(WebGLShaderPrecisionFormat::new(self.global().as_window(), range_min, range_max, precision))
},
Err(error) => {
self.webgl_error(error);
None
}
}
} }
// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10 // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10