Moved the framebuffer gen to the canvas. Cleaned up a lot of unused imports
This commit is contained in:
55
src/main.rs
55
src/main.rs
@@ -10,43 +10,41 @@ extern crate rand;
|
||||
extern crate sfml;
|
||||
extern crate time;
|
||||
|
||||
use sfml::graphics::*;
|
||||
use sfml::graphics::{
|
||||
Color, RenderTarget, RenderWindow,
|
||||
};
|
||||
|
||||
|
||||
use sfml::system::*;
|
||||
use sfml::window::{Key, Style};
|
||||
use sfml::window::mouse::*;
|
||||
use sfml::window::mouse;
|
||||
|
||||
|
||||
|
||||
|
||||
use vulkano::sync;
|
||||
use std::sync::Arc;
|
||||
use std::{fs, mem, iter, ptr};
|
||||
use std::path::PathBuf;
|
||||
use std::result;
|
||||
|
||||
use crate::input::Input;
|
||||
use crate::slider::Slider;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
use crate::timer::Timer;
|
||||
use na::DimAdd;
|
||||
use std::time::{SystemTime, Duration};
|
||||
use std::ffi::CStr;
|
||||
use std::ptr::write;
|
||||
use vulkano::buffer::{BufferUsage, CpuAccessibleBuffer, DeviceLocalBuffer, ImmutableBuffer, BufferAccess};
|
||||
use vulkano::command_buffer::AutoCommandBufferBuilder;
|
||||
use vulkano::descriptor::descriptor_set::PersistentDescriptorSet;
|
||||
use vulkano::device::{Device, DeviceExtensions};
|
||||
use vulkano::instance::{Instance, InstanceExtensions, PhysicalDevice};
|
||||
use vulkano::pipeline::ComputePipeline;
|
||||
use vulkano::descriptor::pipeline_layout::PipelineLayoutAbstract;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
use vulkano::instance::{Instance};
|
||||
|
||||
|
||||
use vulkano::sync::GpuFuture;
|
||||
use shaderc::CompileOptions;
|
||||
use shade_runner::CompileError;
|
||||
|
||||
|
||||
use winit::{EventsLoop, WindowBuilder, WindowEvent, Event, DeviceEvent, VirtualKeyCode, ElementState};
|
||||
use winit::dpi::LogicalSize;
|
||||
use vulkano_win::VkSurfaceBuild;
|
||||
use sprite::Sprite;
|
||||
use crate::canvas::Canvas;
|
||||
|
||||
|
||||
mod util;
|
||||
|
||||
@@ -75,8 +73,7 @@ fn main() {
|
||||
|
||||
let mut processor = vkprocessor::VkProcessor::new(&instance, &surface);
|
||||
processor.compile_kernel(String::from("simple-edge.compute"));
|
||||
processor.compile_shaders(String::from("simple_texture"), &surface);
|
||||
processor.load_buffers(String::from("background.jpg"));
|
||||
processor.load_textures(String::from("background.jpg"));
|
||||
processor.create_swapchain(&surface);
|
||||
|
||||
let mut timer = Timer::new();
|
||||
|
||||
Reference in New Issue
Block a user