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

Use wrappers for GL IDs

Browse source 
See https://github.com/servo/webrender_traits/pull/62.
This commit is contained in:
Anthony Ramine 2016-06-28 15:18:53 +02:00
parent 810735a846
commit 89a0b55c61
11 changed files with 117 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/script/dom/webglbuffer.rs
View file

@ -11,12 +11,12 @@ use dom::bindings::reflector::reflect_dom_object;
use dom::webglobject::WebGLObject;
use ipc_channel::ipc::{self, IpcSender};
use std::cell::Cell;
use webrender_traits::{WebGLCommand, WebGLError, WebGLResult};
use webrender_traits::{WebGLBufferId, WebGLCommand, WebGLError, WebGLResult};
#[dom_struct]
pub struct WebGLBuffer {
webgl_object: WebGLObject,
id: u32,
id: WebGLBufferId,
/// The target to which this buffer was bound the first time
target: Cell<Option<u32>>,
capacity: Cell<usize>,
@ -26,7 +26,9 @@ pub struct WebGLBuffer {
}
impl WebGLBuffer {
fn new_inherited(renderer: IpcSender<CanvasMsg>, id: u32) -> WebGLBuffer {
fn new_inherited(renderer: IpcSender<CanvasMsg>,
id: WebGLBufferId)
-> WebGLBuffer {
WebGLBuffer {
webgl_object: WebGLObject::new_inherited(),
id: id,
@ -43,17 +45,21 @@ impl WebGLBuffer {
renderer.send(CanvasMsg::WebGL(WebGLCommand::CreateBuffer(sender))).unwrap();
let result = receiver.recv().unwrap();
result.map(|buffer_id| WebGLBuffer::new(global, renderer, *buffer_id))
result.map(|buffer_id| WebGLBuffer::new(global, renderer, buffer_id))
}
pub fn new(global: GlobalRef, renderer: IpcSender<CanvasMsg>, id: u32) -> Root<WebGLBuffer> {
reflect_dom_object(box WebGLBuffer::new_inherited(renderer, id), global, WebGLBufferBinding::Wrap)
pub fn new(global: GlobalRef,
renderer: IpcSender<CanvasMsg>,
id: WebGLBufferId)
-> Root<WebGLBuffer> {
reflect_dom_object(box WebGLBuffer::new_inherited(renderer, id),
global, WebGLBufferBinding::Wrap)
}
}
impl WebGLBuffer {
pub fn id(&self) -> u32 {
pub fn id(&self) -> WebGLBufferId {
self.id
}
@ -66,7 +72,8 @@ impl WebGLBuffer {
} else {
self.target.set(Some(target));
}
self.renderer.send(CanvasMsg::WebGL(WebGLCommand::BindBuffer(target, self.id))).unwrap();
let msg = CanvasMsg::WebGL(WebGLCommand::BindBuffer(target, Some(self.id)));
self.renderer.send(msg).unwrap();
Ok(())
}