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

Better error detection when creating an XRWebGLLayer

Browse source
This commit is contained in:
Alan Jeffrey 2019-08-28 19:19:31 -05:00
parent 9fe3c4fc0f
commit b6cf6c0450
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/script/dom/xrwebgllayer.rs
View file

@ -129,12 +129,28 @@ impl XRWebGLLayer {
); );
// Restore the WebGL state while complaining about global mutable state // Restore the WebGL state while complaining about global mutable state
let fb_status = context.CheckFramebufferStatus(constants::FRAMEBUFFER);
let gl_status = context.GetError();
context.BindTexture(constants::TEXTURE_2D, old_texture.as_ref().map(|t| &**t)); context.BindTexture(constants::TEXTURE_2D, old_texture.as_ref().map(|t| &**t));
context.BindFramebuffer(constants::FRAMEBUFFER, old_fbo.as_ref().map(|f| &**f)); context.BindFramebuffer(constants::FRAMEBUFFER, old_fbo.as_ref().map(|f| &**f));
// Step 8.4: "If layer’s resources were unable to be created for any reason, // Step 8.4: "If layer’s resources were unable to be created for any reason,
// throw an OperationError and abort these steps." // throw an OperationError and abort these steps."
sc.or(Err(Error::Operation))?; if let Err(err) = sc {
error!("TexImage2D error {:?} while creating XR context", err);
return Err(Error::Operation);
}
if fb_status != constants::FRAMEBUFFER_COMPLETE {
error!(
"Framebuffer error {:x} while creating XR context",
fb_status
);
return Err(Error::Operation);
}
if gl_status != constants::NO_ERROR {
error!("GL error {:x} while creating XR context", gl_status);
return Err(Error::Operation);
}
// Step 9. "Return layer." // Step 9. "Return layer."
Ok(XRWebGLLayer::new( Ok(XRWebGLLayer::new(