mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
webgl: Implement multiple calls and improve error detection
This commit implements WebGL's: * cullFace * frontFace * enable * disable * depthMask * colorMask * clearDepth * clearStencil * depthFunc * depthRange * hint * lineWidth * pixelStorei * polygonOffset * texParameteri * texParameterf * texImage2D (partially) It inlines a lot of OpenGL calls to keep the file `components/canvas/webgl_paint_task.rs` as small as possible while keeping readability. It also improves error detection on previous calls, and sets node damage on the canvas in the drawing calls. It adds a `TexImage2D` reftest, even though it's not enabled because: * WebGL paints the image when it loads (asynchronously), so the reftest doesn't wait for it and it finishes early * If we change the source for the base64 src of the image it works as expected in non-headless mode, but the test harness locks
This commit is contained in:
parent
af3310f149
commit
6341c77700
12 changed files with 763 additions and 226 deletions
|
@ -3,21 +3,29 @@
|
|||
* 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 dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants;
|
||||
use dom::bindings::codegen::Bindings::WebGLTextureBinding;
|
||||
use dom::bindings::global::GlobalRef;
|
||||
use dom::bindings::js::Root;
|
||||
use dom::bindings::utils::reflect_dom_object;
|
||||
use dom::webglobject::WebGLObject;
|
||||
|
||||
use canvas_traits::{CanvasMsg, CanvasWebGLMsg};
|
||||
use canvas_traits::{CanvasMsg, CanvasWebGLMsg, WebGLError, WebGLResult};
|
||||
use ipc_channel::ipc::{self, IpcSender};
|
||||
use std::cell::Cell;
|
||||
|
||||
pub enum TexParameterValue {
|
||||
Float(f32),
|
||||
Int(i32),
|
||||
}
|
||||
|
||||
#[dom_struct]
|
||||
#[derive(HeapSizeOf)]
|
||||
pub struct WebGLTexture {
|
||||
webgl_object: WebGLObject,
|
||||
id: u32,
|
||||
/// The target to which this texture was bound the first time
|
||||
target: Cell<Option<u32>>,
|
||||
is_deleted: Cell<bool>,
|
||||
#[ignore_heap_size_of = "Defined in ipc-channel"]
|
||||
renderer: IpcSender<CanvasMsg>,
|
||||
|
@ -28,6 +36,7 @@ impl WebGLTexture {
|
|||
WebGLTexture {
|
||||
webgl_object: WebGLObject::new_inherited(),
|
||||
id: id,
|
||||
target: Cell::new(None),
|
||||
is_deleted: Cell::new(false),
|
||||
renderer: renderer,
|
||||
}
|
||||
|
@ -49,8 +58,12 @@ impl WebGLTexture {
|
|||
|
||||
pub trait WebGLTextureHelpers {
|
||||
fn id(self) -> u32;
|
||||
fn bind(self, target: u32);
|
||||
fn bind(self, target: u32) -> WebGLResult<()>;
|
||||
fn delete(self);
|
||||
fn tex_parameter(self,
|
||||
target: u32,
|
||||
name: u32,
|
||||
value: TexParameterValue) -> WebGLResult<()>;
|
||||
}
|
||||
|
||||
impl<'a> WebGLTextureHelpers for &'a WebGLTexture {
|
||||
|
@ -58,8 +71,19 @@ impl<'a> WebGLTextureHelpers for &'a WebGLTexture {
|
|||
self.id
|
||||
}
|
||||
|
||||
fn bind(self, target: u32) {
|
||||
// NB: Only valid texture targets come here
|
||||
fn bind(self, target: u32) -> WebGLResult<()> {
|
||||
if let Some(previous_target) = self.target.get() {
|
||||
if target != previous_target {
|
||||
return Err(WebGLError::InvalidOperation);
|
||||
}
|
||||
} else {
|
||||
self.target.set(Some(target));
|
||||
}
|
||||
|
||||
self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::BindTexture(self.id, target))).unwrap();
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn delete(self) {
|
||||
|
@ -68,4 +92,67 @@ impl<'a> WebGLTextureHelpers for &'a WebGLTexture {
|
|||
self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::DeleteTexture(self.id))).unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
/// We have to follow the conversion rules for GLES 2.0. See:
|
||||
/// https://www.khronos.org/webgl/public-mailing-list/archives/1008/msg00014.html
|
||||
///
|
||||
fn tex_parameter(self,
|
||||
target: u32,
|
||||
name: u32,
|
||||
value: TexParameterValue) -> WebGLResult<()> {
|
||||
let (int_value, _float_value) = match value {
|
||||
TexParameterValue::Int(int_value) => (int_value, int_value as f32),
|
||||
TexParameterValue::Float(float_value) => (float_value as i32, float_value),
|
||||
};
|
||||
|
||||
match name {
|
||||
constants::TEXTURE_MIN_FILTER => {
|
||||
match int_value as u32 {
|
||||
constants::NEAREST |
|
||||
constants::LINEAR |
|
||||
constants::NEAREST_MIPMAP_NEAREST |
|
||||
constants::LINEAR_MIPMAP_NEAREST |
|
||||
constants::NEAREST_MIPMAP_LINEAR |
|
||||
constants::LINEAR_MIPMAP_LINEAR => {
|
||||
self.renderer
|
||||
.send(CanvasMsg::WebGL(CanvasWebGLMsg::TexParameteri(target, name, int_value)))
|
||||
.unwrap();
|
||||
return Ok(());
|
||||
},
|
||||
|
||||
_ => return Err(WebGLError::InvalidEnum),
|
||||
}
|
||||
},
|
||||
constants::TEXTURE_MAG_FILTER => {
|
||||
match int_value as u32 {
|
||||
constants::NEAREST |
|
||||
constants::LINEAR => {
|
||||
self.renderer
|
||||
.send(CanvasMsg::WebGL(CanvasWebGLMsg::TexParameteri(target, name, int_value)))
|
||||
.unwrap();
|
||||
return Ok(());
|
||||
},
|
||||
|
||||
_ => return Err(WebGLError::InvalidEnum),
|
||||
}
|
||||
},
|
||||
constants::TEXTURE_WRAP_S |
|
||||
constants::TEXTURE_WRAP_T => {
|
||||
match int_value as u32 {
|
||||
constants::CLAMP_TO_EDGE |
|
||||
constants::MIRRORED_REPEAT |
|
||||
constants::REPEAT => {
|
||||
self.renderer
|
||||
.send(CanvasMsg::WebGL(CanvasWebGLMsg::TexParameteri(target, name, int_value)))
|
||||
.unwrap();
|
||||
return Ok(());
|
||||
},
|
||||
|
||||
_ => return Err(WebGLError::InvalidEnum),
|
||||
}
|
||||
},
|
||||
|
||||
_ => return Err(WebGLError::InvalidEnum),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue