mitchellhansen/Trac3r-rust
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed old shader_kernel

Browse Source
This commit is contained in:
mitchellhansen
2019-08-29 22:45:05 -07:00
parent ebf2cb5322
commit a2de3557f0
7 changed files with 8 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/canvas.rs
View File

@@ -8,7 +8,6 @@ use vulkano::framebuffer::{FramebufferAbstract, Framebuffer};
use vulkano::device::{Device, Queue};
use vulkano::instance::PhysicalDevice;
use vulkano::image::immutable::ImmutableImage;
use crate::util::shader_kernels::ShaderKernels;
use vulkano::image::{Dimensions, ImageAccess, ImageDimensions, SwapchainImage, ImageUsage, AttachmentImage};
use vulkano::sampler::{Sampler, SamplerAddressMode, MipmapMode, Filter};
use vulkano::descriptor::DescriptorSet;
@@ -22,6 +21,7 @@ use vulkano::pipeline::viewport::Viewport;
use vulkano::descriptor::descriptor::DescriptorDescTy::TexelBuffer;
use crate::canvas_frame::CanvasFrame;
use std::hash::Hash;
use crate::canvas_shader::CanvasShader;
// Canvas is the accumulator of Sprites for drawing
@@ -113,7 +113,7 @@ pub struct CanvasTexture {
impl CanvasTexture {
fn get_descriptor_set(&mut self,
shader: Arc<ShaderKernels>,
shader: Arc<CanvasShader>,
sampler: Arc<Sampler>) -> Box<dyn DescriptorSet + Send + Sync> {
let o: Box<dyn DescriptorSet + Send + Sync> = Box::new(
PersistentDescriptorSet::start(
@@ -133,7 +133,7 @@ pub struct CanvasImage {
}
impl CanvasImage {
fn get_descriptor_set(&mut self, shader: Arc<ShaderKernels>)
fn get_descriptor_set(&mut self, shader: Arc<CanvasShader>)
-> Box<dyn DescriptorSet + Send + Sync> {
let o: Box<dyn DescriptorSet + Send + Sync> = Box::new(
PersistentDescriptorSet::start(
@@ -153,7 +153,7 @@ pub struct CanvasState {
// hold the image, texture, and shader buffers the same was as we do CompuState
image_buffers: Vec<Arc<CanvasImage>>,
texture_buffers: Vec<Arc<CanvasTexture>>,
shader_buffers: HashMap<String, ShaderKernels>,
shader_buffers: HashMap<String, CanvasShader>,
// Hold onto the vertices we get from the Compu and Canvas Frames
// When the run comes around, push the vertices to the GPU
@@ -211,13 +211,13 @@ impl CanvasState {
image_buffers: vec![],
texture_buffers: vec![],
shader_buffers: HashMap::from_iter(vec![
(solid_color_kernel.clone(), ShaderKernels::new(solid_color_kernel.clone(),
(solid_color_kernel.clone(), CanvasShader::new(solid_color_kernel.clone(),
capabilities.clone(),
queue.clone(),
physical.clone(),
device.clone())
),
(texture_kernel.clone(), ShaderKernels::new(texture_kernel.clone(),
(texture_kernel.clone(), CanvasShader::new(texture_kernel.clone(),
capabilities.clone(),
queue.clone(),
physical.clone(),
@@ -378,7 +378,7 @@ impl CanvasState {
}
}
fn get_solid_color_descriptor_set(&self, kernel: Arc<ShaderKernels>) -> Box<dyn DescriptorSet + Send + Sync> {
fn get_solid_color_descriptor_set(&self, kernel: Arc<CanvasShader>) -> Box<dyn DescriptorSet + Send + Sync> {
let o: Box<dyn DescriptorSet + Send + Sync> = Box::new(
PersistentDescriptorSet::start(