Skip to content

Commit

Permalink
Merge #2882
Browse files Browse the repository at this point in the history
2882: Presentation Surface API r=msiglreith a=kvark

Fixes #2863
PR checklist:
- [x] `make` succeeds (on *nix)
- [x] `make reftests` succeeds
- [x] tested examples with the following backends: Metal
- [x] `rustfmt` run on changed code


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
Co-authored-by: Dzmitry Malyshau <dmalyshau@mozilla.com>
  • Loading branch information
3 people committed Aug 13, 2019
2 parents 46e24bf + a2cf6c1 commit 793791f
Show file tree
Hide file tree
Showing 37 changed files with 1,836 additions and 864 deletions.
2 changes: 1 addition & 1 deletion examples/colour-uniform/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ trait SurfaceTrait {
impl SurfaceTrait for <back::Backend as Backend>::Surface {
#[cfg(feature = "gl")]
fn get_context_t(&self) -> &back::glutin::RawContext<back::glutin::PossiblyCurrent> {
self.get_context()
self.context()
}
}

Expand Down
Loading

0 comments on commit 793791f

Please sign in to comment.