Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Presentation Surface API #2882

Merged
merged 3 commits into from
Aug 14, 2019
Merged

Presentation Surface API #2882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40a905f
Alternative swapchain model
kvark Aug 12, 2019
a2cf6c1
Cargo fmt pass
kvark Aug 13, 2019
417593c
Disable X11 init in Travis
kvark Aug 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ before_install:
# Will no longer be needed when Trusty build environment goes out of beta at Travis CI
# (assuming it will have libsdl2-dev and Rust by then)
# see https://docs.travis-ci.com/user/trusty-ci-environment/
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then export DISPLAY=:99.0 && sh -e /etc/init.d/xvfb start && make travis-sdl2 && export CXX=g++-5; fi
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then make travis-sdl2 && export CXX=g++-5; fi
- if [[ $TRAVIS_OS_NAME == "osx" ]]; then brew update && brew install sdl2; fi
- if [[ $TRAVIS_OS_NAME == "windows" ]]; then choco install make; fi
- rustup self update
Expand Down
2 changes: 1 addition & 1 deletion examples/colour-uniform/main.rs
View file
Open in desktop
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