encounter/rust-sdl2
0
0
Fork 0
mirror of https://github.com/encounter/rust-sdl2.git synced 2026-07-10 21:18:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove return values from gl_(un)bind_texture(), change f64 to f32

Browse Source 
If either `gl_bind_texture()` or `gl_unbind_texture()` fails, it means
OpenGL is not supported for the renderer.
This commit is contained in:
Dan Spencer
2015-01-27 10:59:16 -07:00
parent 66e3ccc026
commit 8aa54d4eba
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sdl2/render.rs
+31 -20
View File
@@ -703,33 +703,44 @@ impl<'renderer> Texture<'renderer> {
}
}
pub unsafe fn gl_bind_texture(&mut self) -> SdlResult<(f64, f64)> {
let texw: c_float = 0.0;
let texh: c_float = 0.0;
pub unsafe fn gl_bind_texture(&mut self) -> (f32, f32) {
unsafe {
let texw = 0.0;
let texh = 0.0;
let result = unsafe {
ll::SDL_GL_BindTexture(self.raw, &texw, &texh) == 0
};
if result {
Ok((texw as f64, texh as f64))
} else {
Err("Operation not supported".to_owned())
if ll::SDL_GL_BindTexture(self.raw, &texw, &texh) == 0 {
(texw, texh)
} else {
panic!("OpenGL texture binding not supported");
}
}
}
pub unsafe fn gl_unbind_texture(&mut self) -> bool {
unsafe { ll::SDL_GL_UnbindTexture(self.raw) == 0 }
pub unsafe fn gl_unbind_texture(&mut self) {
unsafe {
if ll::SDL_GL_UnbindTexture(self.raw) != 0 {
panic!("OpenGL texture unbinding not supported");
}
}
}
pub fn gl_with_bind<R, F: FnOnce(f64, f64) -> R>(&mut self, f: F) -> R {
pub fn gl_with_bind<R, F: FnOnce(f32, f32) -> R>(&mut self, f: F) -> R {
unsafe {
let texw: c_float = 0.0;
let texh: c_float = 0.0;
if ll::SDL_GL_BindTexture(self.raw, &texw, &texh) != 0 { panic!("could not bind texture"); }
let rv = f(texw as f64, texh as f64);
ll::SDL_GL_UnbindTexture(self.raw);
rv
let texw = 0.0;
let texh = 0.0;
if ll::SDL_GL_BindTexture(self.raw, &texw, &texh) == 0 {
let return_value = f(texw, texh);
if ll::SDL_GL_UnbindTexture(self.raw) == 0 {
return_value
} else {
// This should never happen...
panic!();
}
} else {
panic!("OpenGL texture binding not supported");
}
}
}
}