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

webgl: Ensure that framebuffers have a color attachment before reading or writing.

Browse source
This commit is contained in:
Josh Matthews 2018-08-15 13:27:44 -04:00
parent 80ed829241
commit d179435eab
4 changed files with 129 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -203,6 +203,16 @@ impl WebGLFramebuffer {
return self.status.get();
}
pub fn check_status_for_rendering(&self) -> u32 {
let result = self.check_status();
if result == constants::FRAMEBUFFER_COMPLETE {
if self.color.borrow().is_none() {
return constants::FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
}
}
result
}
pub fn renderbuffer(&self, attachment: u32, rb: Option<&WebGLRenderbuffer>) -> WebGLResult<()> {
let binding = match attachment {
constants::COLOR_ATTACHMENT0 => &self.color,

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

@ -339,7 +339,7 @@ impl WebGLRenderingContext {
// this: clear() and getParameter(IMPLEMENTATION_COLOR_READ_*).
fn validate_framebuffer(&self) -> WebGLResult<()> {
match self.bound_framebuffer.get() {
Some(ref fb) if fb.check_status() != constants::FRAMEBUFFER_COMPLETE => {
Some(ref fb) if fb.check_status_for_rendering() != constants::FRAMEBUFFER_COMPLETE => {
Err(InvalidFramebufferOperation)
},
_ => Ok(()),