pulled out the draw call. forgot to allocate buffers

This commit is contained in:
2019-08-11 21:03:28 -07:00
parent 0be20eb959
commit e351e36c92
6 changed files with 100 additions and 48 deletions

View File

@@ -9,7 +9,7 @@ use vulkano::image::swapchain::SwapchainImage;
use winit::{Window};
use crate::util::compute_kernel::ComputeKernel;
use crate::util::compute_image::ComputeImage;
use crate::canvas::Canvas;
use crate::canvas::{Canvas, CanvasFrame};
pub struct VkProcessor<'a> {
@@ -146,9 +146,15 @@ impl<'a> VkProcessor<'a> {
self.compute_image.clone().unwrap().clone().save_image();
}
pub fn get_canvas(&mut self) -> &Canvas {
&self.canvas
}
pub fn run(&mut self,
surface: &'a Arc<Surface<Window>>,
mut frame_future: Box<dyn GpuFuture>,
surface: &'a Arc<Surface<Window>>,
mut frame_future: Box<dyn GpuFuture>,
canvas_frame: CanvasFrame,
) -> Box<dyn GpuFuture> {
let mut framebuffers =
self.canvas.window_size_dependent_setup(&self.swapchain_images.clone().unwrap().clone());
@@ -190,6 +196,8 @@ impl<'a> VkProcessor<'a> {
.copy_buffer_to_image(self.compute_image.clone().unwrap().clone().rw_buffers.get(0).unwrap().clone(),
self.compute_image.clone().unwrap().clone().get_swap_buffer().clone()).unwrap();
self.canvas.draw(canvas_frame);
self.canvas.allocate_vertex_buffers(self.device.clone());
let mut command_buffer = self.canvas.draw_commands(command_buffer, framebuffers, image_num);