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 "owned" from Renderer

Browse Source
This commit is contained in:
Dan Spencer
2015-01-27 10:59:12 -07:00
parent 09c57f51ae
commit e1cecb1736
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sdl2/render.rs
+5 -15
View File
@@ -91,22 +91,15 @@ pub enum RendererParent {
Window(Window)
}
#[allow(raw_pointer_derive)]
pub struct Renderer {
raw: *const ll::SDL_Renderer,
parent: Option<RendererParent>,
render_target: RefCell<RenderTarget>,
owned: bool
render_target: RefCell<RenderTarget>
}
#[unsafe_destructor]
impl Drop for Renderer {
fn drop(&mut self) {
if self.owned {
unsafe {
ll::SDL_DestroyRenderer(self.raw);
}
}
unsafe { ll::SDL_DestroyRenderer(self.raw) };
}
}
@@ -127,8 +120,7 @@ impl Renderer {
Ok(Renderer {
raw: raw,
parent: Some(RendererParent::Window(window)),
render_target: RefCell::new(RenderTarget { raw: raw }),
owned: true
render_target: RefCell::new(RenderTarget { raw: raw })
})
}
}
@@ -144,8 +136,7 @@ impl Renderer {
Ok(Renderer {
raw: raw_renderer,
parent: Some(RendererParent::Window(window)),
render_target: RefCell::new(RenderTarget { raw: raw_renderer }),
owned: true
render_target: RefCell::new(RenderTarget { raw: raw_renderer })
})
} else {
Err(get_error())
@@ -158,8 +149,7 @@ impl Renderer {
Ok(Renderer {
raw: raw_renderer,
parent: Some(RendererParent::Surface(surface)),
render_target: RefCell::new(RenderTarget { raw: raw_renderer }),
owned: true
render_target: RefCell::new(RenderTarget { raw: raw_renderer })
})
} else {
Err(get_error())