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

Introduce VertexAttribData

Browse source
This commit is contained in:
Anthony Ramine 2018-07-02 15:35:36 +02:00
parent 5d43f1c9bd
commit f108a3e797
2 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/webgl_extensions/ext/oesvertexarrayobject.rs
View file

@ -75,8 +75,8 @@ impl OESVertexArrayObjectMethods for OESVertexArrayObject {
} }
// Remove VAO references from buffers // Remove VAO references from buffers
for (_, ref buffer) in vao.vertex_attribs().borrow().iter() { for attrib_data in &*vao.vertex_attribs().borrow() {
if let Some(ref buffer) = *buffer { if let Some(buffer) = attrib_data.buffer() {
buffer.remove_vao_reference(vao.id()); buffer.remove_vao_reference(vao.id());
} }
} }
@ -101,8 +101,8 @@ impl OESVertexArrayObjectMethods for OESVertexArrayObject {
if let Some(bound_vao) = self.bound_vao.get() { if let Some(bound_vao) = self.bound_vao.get() {
// Store buffers attached to attrib pointers // Store buffers attached to attrib pointers
bound_vao.vertex_attribs().set_from(&self.ctx.vertex_attribs()); bound_vao.vertex_attribs().set_from(&self.ctx.vertex_attribs());
for (_, ref buffer) in bound_vao.vertex_attribs().borrow().iter() { for attrib_data in &*bound_vao.vertex_attribs().borrow() {
if let Some(ref buffer) = *buffer { if let Some(buffer) = attrib_data.buffer() {
buffer.add_vao_reference(bound_vao.id()); buffer.add_vao_reference(bound_vao.id());
} }
} }

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

@ -2205,7 +2205,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
{ {
// https://www.khronos.org/registry/webgl/specs/latest/1.0/#6.2 // https://www.khronos.org/registry/webgl/specs/latest/1.0/#6.2
let buffers = self.vertex_attribs.borrow(); let buffers = self.vertex_attribs.borrow();
if buffers.iter().any(|&(enabled, ref buffer)| enabled && buffer.is_none()) { if buffers.iter().any(|data| data.enabled_as_array && data.buffer.is_none()) {
return self.webgl_error(InvalidOperation); return self.webgl_error(InvalidOperation);
} }
} }
@ -2280,7 +2280,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
{ {
// https://www.khronos.org/registry/webgl/specs/latest/1.0/#6.2 // https://www.khronos.org/registry/webgl/specs/latest/1.0/#6.2
let buffers = self.vertex_attribs.borrow(); let buffers = self.vertex_attribs.borrow();
if buffers.iter().any(|&(enabled, ref buffer)| enabled && buffer.is_none()) { if buffers.iter().any(|data| data.enabled_as_array && data.buffer.is_none()) {
return self.webgl_error(InvalidOperation); return self.webgl_error(InvalidOperation);
} }
} }
@ -3808,7 +3808,7 @@ impl UniformSetterType {
#[derive(JSTraceable, MallocSizeOf)] #[derive(JSTraceable, MallocSizeOf)]
#[must_root] #[must_root]
pub struct VertexAttribs { pub struct VertexAttribs {
attribs: DomRefCell<Box<[(bool, Option<Dom<WebGLBuffer>>)]>>, attribs: DomRefCell<Box<[VertexAttribData]>>,
} }
impl VertexAttribs { impl VertexAttribs {
@ -3827,29 +3827,42 @@ impl VertexAttribs {
self.attribs.borrow_mut().clone_from_slice(&other.attribs.borrow()); self.attribs.borrow_mut().clone_from_slice(&other.attribs.borrow());
} }
pub fn borrow(&self) -> Ref<[(bool, Option<Dom<WebGLBuffer>>)]> { pub fn borrow(&self) -> Ref<[VertexAttribData]> {
Ref::map(self.attribs.borrow(), |attribs| &**attribs) Ref::map(self.attribs.borrow(), |attribs| &**attribs)
} }
fn delete_buffer(&self, buffer: &WebGLBuffer) { fn delete_buffer(&self, buffer: &WebGLBuffer) {
for attrib in &mut **self.attribs.borrow_mut() { for attrib in &mut **self.attribs.borrow_mut() {
if attrib.1.as_ref().map_or(false, |b| b.id() == buffer.id()) { if attrib.buffer().map_or(false, |b| b.id() == buffer.id()) {
attrib.1 = None; attrib.buffer = None;
} }
} }
} }
fn get(&self, index: u32) -> Option<Ref<WebGLBuffer>> { fn get(&self, index: u32) -> Option<Ref<WebGLBuffer>> {
ref_filter_map(self.attribs.borrow(), |attribs| { ref_filter_map(self.attribs.borrow(), |attribs| {
attribs[index as usize].1.as_ref().map(|buffer| &**buffer) attribs[index as usize].buffer.as_ref().map(|buffer| &**buffer)
}) })
} }
fn enabled_as_array(&self, index: u32, value: bool) { fn enabled_as_array(&self, index: u32, value: bool) {
self.attribs.borrow_mut()[index as usize].0 = value; self.attribs.borrow_mut()[index as usize].enabled_as_array = value;
} }
fn bind_buffer(&self, index: u32, buffer: &WebGLBuffer) { fn bind_buffer(&self, index: u32, buffer: &WebGLBuffer) {
self.attribs.borrow_mut()[index as usize].1 = Some(Dom::from_ref(buffer)); self.attribs.borrow_mut()[index as usize].buffer = Some(Dom::from_ref(buffer));
}
}
#[derive(Clone, Default, JSTraceable, MallocSizeOf)]
#[must_root]
pub struct VertexAttribData {
enabled_as_array: bool,
buffer: Option<Dom<WebGLBuffer>>,
}
impl VertexAttribData {
pub fn buffer(&self) -> Option<&WebGLBuffer> {
self.buffer.as_ref().map(|b| &**b)
} }
} }