elias/imgui-rs
1
0
Fork 0
mirror of https://github.com/eliasstepanik/imgui-rs.git synced 2026-01-27 13:28:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wrap ProgramChooserCreationError properly

Browse Source
This commit is contained in:
Will Usher 2015-10-17 14:14:27 -06:00
parent 064235f8c3
commit 2fa549bcc9
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/glium_renderer.rs
View File

@ -17,7 +17,7 @@ pub type RendererResult<T> = Result<T, RendererError>;
pub enum RendererError { pub enum RendererError {
Vertex(vertex::BufferCreationError), Vertex(vertex::BufferCreationError),
Index(index::BufferCreationError), Index(index::BufferCreationError),
Program(program::ProgramCreationError), Program(program::ProgramChooserCreationError),
Texture(texture::TextureCreationError), Texture(texture::TextureCreationError),
Draw(DrawError) Draw(DrawError)
} }
@ -47,8 +47,8 @@ impl From<index::BufferCreationError> for RendererError {
} }
} }
impl From<program::ProgramCreationError> for RendererError { impl From<program::ProgramChooserCreationError> for RendererError {
fn from(e: program::ProgramCreationError) -> RendererError { fn from(e: program::ProgramChooserCreationError) -> RendererError {
RendererError::Program(e) RendererError::Program(e)
} }
} }
@ -152,11 +152,7 @@ impl DeviceObjects {
let vertex_buffer = try!(VertexBuffer::empty_dynamic(ctx, 0)); let vertex_buffer = try!(VertexBuffer::empty_dynamic(ctx, 0));
let index_buffer = try!(IndexBuffer::empty_dynamic(ctx, PrimitiveType::TrianglesList, 0)); let index_buffer = try!(IndexBuffer::empty_dynamic(ctx, PrimitiveType::TrianglesList, 0));
let program = match compile_default_program(ctx) { let program = try!(compile_default_program(ctx));
Ok(p) => p,
Err(program::ProgramChooserCreationError::NoVersion) => panic!("No version for GLSL program"),
Err(e) => panic!("Error compiling shaders {:?}", e),
};
let texture = try!(im_gui.prepare_texture(|handle| { let texture = try!(im_gui.prepare_texture(|handle| {
let data = RawImage2d { let data = RawImage2d {
data: Cow::Borrowed(handle.pixels), data: Cow::Borrowed(handle.pixels),