diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-08-02 09:26:35 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-02 09:26:35 -0400 |
commit | bde8a1e2390b8fb41c8ce03c4d2914d7980650a0 (patch) | |
tree | 970b9139b952cffcb55129c7bf71c3713bc69b8f /components/script/dom/webglrenderingcontext.rs | |
parent | a5fba3c8d612eeb107be538742725f9a8370d5e0 (diff) | |
parent | 03eb7e4dd2c36265319440db38100ba9aa92e182 (diff) | |
download | servo-bde8a1e2390b8fb41c8ce03c4d2914d7980650a0.tar.gz servo-bde8a1e2390b8fb41c8ce03c4d2914d7980650a0.zip |
Auto merge of #21313 - jdm:glstuff, r=nox
Framebuffer and renderbuffer fixes
This commits address two separate panics that occur when running the framebuffer-object-attachment.html test. The test still panics due to another framebuffer completion status problem, so the overall test results don't demonstrate any improvement.
---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #21252
- [x] There are tests for these changes
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21313)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/webglrenderingcontext.rs')
-rw-r--r-- | components/script/dom/webglrenderingcontext.rs | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index afdbda09dfe..3d693f1bb96 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -71,6 +71,12 @@ use std::cmp; use std::ptr::{self, NonNull}; use webrender_api; +pub fn is_gles() -> bool { + // TODO: align this with the actual kind of graphics context in use, rather than + // making assumptions based on platform + cfg!(any(target_os = "android", target_os = "ios")) +} + type ImagePixelResult = Result<(Vec<u8>, Size2D<i32>, bool), ()>; pub const MAX_UNIFORM_AND_ATTRIBUTE_LEN: usize = 256; @@ -2702,10 +2708,17 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { return NullValue(); } - let (sender, receiver) = webgl_channel().unwrap(); - self.send_command(WebGLCommand::GetRenderbufferParameter(target, pname, sender)); + let result = if pname == constants::RENDERBUFFER_INTERNAL_FORMAT { + let rb = self.bound_renderbuffer.get().unwrap(); + rb.internal_format() as i32 + } else { + let (sender, receiver) = webgl_channel().unwrap(); + self.send_command(WebGLCommand::GetRenderbufferParameter(target, pname, sender)); + receiver.recv().unwrap() + }; - Int32Value(receiver.recv().unwrap()) + + Int32Value(result) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 |