Minor clippy fixes

This commit is contained in:
Joonas Javanainen 2018-10-13 00:41:13 +03:00
parent cddef5ee34
commit c9b03816d4
No known key found for this signature in database
GPG Key ID: D39CCA5CB19B9179
3 changed files with 18 additions and 19 deletions

View File

@ -189,13 +189,13 @@ impl<R: Resources> Renderer<R> {
}; };
Ok(Renderer { Ok(Renderer {
bundle: Bundle { bundle: Bundle {
slice: slice, slice,
pso: pso, pso,
vertex_buffer: vertex_buffer, vertex_buffer,
out: out, out,
}, },
index_buffer: index_buffer, index_buffer,
textures: textures, textures,
}) })
} }
@ -277,8 +277,8 @@ impl<R: Resources> Renderer<R> {
}; };
let data = pipe::BorrowedData { let data = pipe::BorrowedData {
vertex_buffer: &self.bundle.vertex_buffer, vertex_buffer: &self.bundle.vertex_buffer,
matrix: matrix, matrix,
tex: tex, tex,
out: &self.bundle.out, out: &self.bundle.out,
scissor: &scissor, scissor: &scissor,
}; };
@ -301,7 +301,8 @@ impl<R: Resources> Renderer<R> {
Bind::empty(), Bind::empty(),
)?; )?;
} }
Ok(encoder.update_buffer(&self.bundle.vertex_buffer, vtx_buffer, 0)?) encoder.update_buffer(&self.bundle.vertex_buffer, vtx_buffer, 0)?;
Ok(())
} }
fn upload_index_buffer<F: Factory<R>, C: CommandBuffer<R>>( fn upload_index_buffer<F: Factory<R>, C: CommandBuffer<R>>(
&mut self, &mut self,
@ -318,7 +319,8 @@ impl<R: Resources> Renderer<R> {
)?; )?;
self.bundle.slice.buffer = self.index_buffer.clone().into_index_buffer(factory); self.bundle.slice.buffer = self.index_buffer.clone().into_index_buffer(factory);
} }
Ok(encoder.update_buffer(&self.index_buffer, idx_buffer, 0)?) encoder.update_buffer(&self.index_buffer, idx_buffer, 0)?;
Ok(())
} }
} }

View File

@ -8,7 +8,7 @@ use glium::program;
use glium::texture; use glium::texture;
use glium::vertex; use glium::vertex;
use glium::{DrawError, IndexBuffer, Program, Surface, Texture2d, VertexBuffer}; use glium::{DrawError, IndexBuffer, Program, Surface, Texture2d, VertexBuffer};
use imgui::{DrawList, FrameSize, ImDrawIdx, ImDrawVert, ImGui, ImTexture, Textures, Ui}; use imgui::{DrawList, FrameSize, ImGui, ImTexture, Textures, Ui};
use std::borrow::Cow; use std::borrow::Cow;
use std::fmt; use std::fmt;
use std::rc::Rc; use std::rc::Rc;
@ -79,7 +79,7 @@ impl Renderer {
let device_objects = DeviceObjects::init(imgui, ctx)?; let device_objects = DeviceObjects::init(imgui, ctx)?;
Ok(Renderer { Ok(Renderer {
ctx: Rc::clone(ctx.get_context()), ctx: Rc::clone(ctx.get_context()),
device_objects: device_objects, device_objects,
}) })
} }
@ -109,7 +109,7 @@ impl Renderer {
]; ];
let result = ui.render(|ui, mut draw_data| { let result = ui.render(|ui, mut draw_data| {
draw_data.scale_clip_rects(ui.imgui().display_framebuffer_scale()); draw_data.scale_clip_rects(ui.imgui().display_framebuffer_scale());
for draw_list in draw_data.into_iter() { for draw_list in &draw_data {
self.render_draw_list(surface, &draw_list, fb_size, matrix)?; self.render_draw_list(surface, &draw_list, fb_size, matrix)?;
} }
Ok(()) Ok(())
@ -237,9 +237,6 @@ impl DeviceObjects {
let mut textures = Textures::new(); let mut textures = Textures::new();
im_gui.set_font_texture_id(textures.insert(texture)); im_gui.set_font_texture_id(textures.insert(texture));
Ok(DeviceObjects { Ok(DeviceObjects { program, textures })
program: program,
textures: textures,
})
} }
} }

View File

@ -8,7 +8,7 @@ use sys;
pub struct ImTexture(usize); pub struct ImTexture(usize);
impl ImTexture { impl ImTexture {
pub fn id(&self) -> usize { pub fn id(self) -> usize {
self.0 self.0
} }
} }
@ -60,7 +60,7 @@ impl<'ui> Image<'ui> {
w: 0.0, w: 0.0,
}; };
Image { Image {
texture_id: texture_id, texture_id,
size: size.into(), size: size.into(),
uv0: DEFAULT_UV0, uv0: DEFAULT_UV0,
uv1: DEFAULT_UV1, uv1: DEFAULT_UV1,