This commit is contained in:
2019-10-07 20:34:41 -07:00
parent 2fa08bf99e
commit e4a9170515
4 changed files with 24 additions and 24 deletions

View File

@@ -565,25 +565,25 @@ impl CanvasState {
}
// Text
let mut shader = self.text_buffers.get(
self.get_shader_handle(String::from("simple_text"))
.unwrap().clone().handle as usize
).unwrap();
// let mut shader = self.text_buffers.get(
// self.get_shader_handle(String::from("simple_text"))
// .unwrap().clone().handle as usize
// ).unwrap();
if !self.text_vertex_buffer.is_empty() {
for (text_handle, vertex_buffer) in self.text_vertex_buffer.clone() {
let handle = texture_handle.clone().handle as usize;
let descriptor_set = self.text_buffers.get(handle).clone().unwrap().clone()
.get_descriptor_set(shader.get_pipeline(), self.sampler.clone());
command_buffer = command_buffer.draw(
shader.get_pipeline().clone(),
// Multiple vertex buffers must have their definition in the pipeline!
&self.dynamic_state.clone(), vec![vertex_buffer],
vec![descriptor_set], (),
).unwrap();
}
}
// if !self.text_vertex_buffer.is_empty() {
// for (text_handle, vertex_buffer) in self.text_vertex_buffer.clone() {
// let handle = text_handle.clone().handle as usize;
// let descriptor_set = self.text_buffers.get(handle).clone().unwrap().clone()
// .get_descriptor_set(shader.get_pipeline(), self.sampler.clone());
//
// command_buffer = command_buffer.draw(
// shader.get_pipeline().clone(),
// // Multiple vertex buffers must have their definition in the pipeline!
// &self.dynamic_state.clone(), vec![vertex_buffer],
// vec![descriptor_set], (),
// ).unwrap();
// }
// }
command_buffer
.end_render_pass()