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

Misc fixes #1088

Merged
merged 2 commits into from
Dec 21, 2018
Merged

Misc fixes #1088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc355a1
api: ios: use trait signature in raw_handle()
ceyusa Nov 8, 2018
6927289
egl: remove dead code warning on finish_pbuffer()
ceyusa Dec 4, 2018
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
1 change: 1 addition & 0 deletions src/api/egl/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ impl<'a> ContextPrototype<'a> {
self.finish_impl(surface)
}

#[cfg(any(target_os = "android", target_os = "windows"))]
pub fn finish_pbuffer(self, dimensions: (u32, u32)) -> Result<Context, CreationError> {
let attrs = &[
ffi::egl::WIDTH as c_int, dimensions.0 as c_int,
Expand Down
2 changes: 1 addition & 1 deletion src/api/ios/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ impl Drop for Context {
impl GlContextExt for Context {
type Handle = *mut c_void;
#[inline]
unsafe fn raw_handle(&self) -> *mut c_void {
unsafe fn raw_handle(&self) -> Self::Handle {
self.eagl_context as *mut c_void
}
}