From b1765c68821d12a21cd304f7dffaa3bdc8f101e4 Mon Sep 17 00:00:00 2001 From: ecoal95 Date: Sun, 14 Jun 2015 22:55:50 +0200 Subject: webgl: Refactor implementation to move logic inside the DOM interfaces This improves the encapsulation and consistency in our WebGL implementation. Also allows to implement new methods such as `getShaderSource()`. It will also allow us to use `delete()` in the destructors of them (note that we will want to keep track of them from the context). --- components/script/dom/webglbuffer.rs | 40 ++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) (limited to 'components/script/dom/webglbuffer.rs') diff --git a/components/script/dom/webglbuffer.rs b/components/script/dom/webglbuffer.rs index f7c17cb8f04..b9941026353 100644 --- a/components/script/dom/webglbuffer.rs +++ b/components/script/dom/webglbuffer.rs @@ -5,35 +5,63 @@ // https://www.khronos.org/registry/webgl/specs/latest/1.0/webgl.idl use dom::bindings::codegen::Bindings::WebGLBufferBinding; use dom::bindings::global::GlobalRef; -use dom::bindings::js::Root; +use dom::bindings::js::{Temporary, JSRef}; use dom::bindings::utils::reflect_dom_object; use dom::webglobject::WebGLObject; +use canvas_traits::{CanvasMsg, CanvasWebGLMsg}; +use std::sync::mpsc::{channel, Sender}; +use std::cell::Cell; + #[dom_struct] pub struct WebGLBuffer { webgl_object: WebGLObject, id: u32, + is_deleted: Cell, + renderer: Sender, } impl WebGLBuffer { - fn new_inherited(id: u32) -> WebGLBuffer { + fn new_inherited(renderer: Sender, id: u32) -> WebGLBuffer { WebGLBuffer { webgl_object: WebGLObject::new_inherited(), id: id, + is_deleted: Cell::new(false), + renderer: renderer, } } - pub fn new(global: GlobalRef, id: u32) -> Root { - reflect_dom_object(box WebGLBuffer::new_inherited(id), global, WebGLBufferBinding::Wrap) + pub fn maybe_new(global: GlobalRef, renderer: Sender) -> Option> { + let (sender, receiver) = channel(); + renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::CreateBuffer(sender))).unwrap(); + receiver.recv().unwrap() + .map(|buffer_id| WebGLBuffer::new(global, renderer, *buffer_id)) + } + + pub fn new(global: GlobalRef, renderer: Sender, id: u32) -> Root { + reflect_dom_object(box WebGLBuffer::new_inherited(renderer, id), global, WebGLBufferBinding::Wrap) } } pub trait WebGLBufferHelpers { - fn get_id(self) -> u32; + fn id(&self) -> u32; + fn bind(&self, target: u32); + fn delete(&self); } impl<'a> WebGLBufferHelpers for &'a WebGLBuffer { - fn get_id(self) -> u32 { + fn id(self) -> u32 { self.id } + + fn bind(self, target: u32) { + self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::BindBuffer(target, self.id))).unwrap(); + } + + fn delete(self) { + if !self.is_deleted.get() { + self.is_deleted.set(true); + self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::DeleteBuffer(self.id))).unwrap(); + } + } } -- cgit v1.2.3 From 42bd43a696939c3259284a01b8ef64aa13a9939c Mon Sep 17 00:00:00 2001 From: ecoal95 Date: Mon, 15 Jun 2015 00:22:15 +0200 Subject: webgl: Make bind* calls more spec-compliant --- components/script/dom/webglbuffer.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'components/script/dom/webglbuffer.rs') diff --git a/components/script/dom/webglbuffer.rs b/components/script/dom/webglbuffer.rs index b9941026353..bf6d8618118 100644 --- a/components/script/dom/webglbuffer.rs +++ b/components/script/dom/webglbuffer.rs @@ -5,7 +5,7 @@ // https://www.khronos.org/registry/webgl/specs/latest/1.0/webgl.idl use dom::bindings::codegen::Bindings::WebGLBufferBinding; use dom::bindings::global::GlobalRef; -use dom::bindings::js::{Temporary, JSRef}; +use dom::bindings::js::Root; use dom::bindings::utils::reflect_dom_object; use dom::webglobject::WebGLObject; @@ -44,9 +44,9 @@ impl WebGLBuffer { } pub trait WebGLBufferHelpers { - fn id(&self) -> u32; - fn bind(&self, target: u32); - fn delete(&self); + fn id(self) -> u32; + fn bind(self, target: u32); + fn delete(self); } impl<'a> WebGLBufferHelpers for &'a WebGLBuffer { -- cgit v1.2.3 From 8438db89e151ed07b32a5b37fd4c4f903605c126 Mon Sep 17 00:00:00 2001 From: ecoal95 Date: Mon, 6 Jul 2015 22:56:42 +0200 Subject: address review comments --- components/script/dom/webglbuffer.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'components/script/dom/webglbuffer.rs') diff --git a/components/script/dom/webglbuffer.rs b/components/script/dom/webglbuffer.rs index bf6d8618118..4970b577bb7 100644 --- a/components/script/dom/webglbuffer.rs +++ b/components/script/dom/webglbuffer.rs @@ -34,8 +34,9 @@ impl WebGLBuffer { pub fn maybe_new(global: GlobalRef, renderer: Sender) -> Option> { let (sender, receiver) = channel(); renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::CreateBuffer(sender))).unwrap(); - receiver.recv().unwrap() - .map(|buffer_id| WebGLBuffer::new(global, renderer, *buffer_id)) + + let result = receiver.recv().unwrap(); + result.map(|buffer_id| WebGLBuffer::new(global, renderer, *buffer_id)) } pub fn new(global: GlobalRef, renderer: Sender, id: u32) -> Root { -- cgit v1.2.3