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

webgl: Remove knowledge of attached framebuffers from renderbuffers and textures.

Browse source
This commit is contained in:
Josh Matthews 2018-09-10 16:27:58 -04:00
parent b8ee62e67b
commit 4edb7b194c
3 changed files with 11 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/script/dom/webglframebuffer.rs
View file

@ -274,7 +274,9 @@ impl WebGLFramebuffer {
let rb_id = match rb {
Some(rb) => {
rb.attach(self)?;
if !rb.ever_bound() {
return Err(WebGLError::InvalidOperation);
}
*binding.borrow_mut() = Some(WebGLFramebufferAttachment::Renderbuffer(Dom::from_ref(rb)));
Some(rb.id())
}
@ -305,16 +307,7 @@ impl WebGLFramebuffer {
binding: &DomRefCell<Option<WebGLFramebufferAttachment>>,
attachment: u32,
) {
let attachment_obj = binding.borrow().as_ref().map(WebGLFramebufferAttachment::root);
match attachment_obj {
Some(WebGLFramebufferAttachmentRoot::Renderbuffer(ref rb)) =>
rb.unattach(self),
Some(WebGLFramebufferAttachmentRoot::Texture(ref texture)) =>
texture.unattach(self),
None => (),
}
*binding.borrow_mut() = None;
if INTERESTING_ATTACHMENT_POINTS.contains(&attachment) {
self.reattach_depth_stencil();
}
@ -429,7 +422,6 @@ impl WebGLFramebuffer {
_ => return Err(WebGLError::InvalidOperation),
}
texture.attach(self);
*binding.borrow_mut() = Some(WebGLFramebufferAttachment::Texture {
texture: Dom::from_ref(texture),
level: level }