hitting this damn shader module again. Very unergonomic interface with the fact that the entry point doesn't just own the shadermodule

src/canvas/canvas_state.rs

@@ -1,5 +1,5 @@
 use vulkano::command_buffer::{AutoCommandBufferBuilder, DynamicState};
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use vulkano::buffer::{BufferAccess, BufferUsage, ImmutableBuffer, CpuAccessibleBuffer};
 use std::sync::Arc;
 use vulkano::format::{ClearValue, Format, R8Unorm};
@@ -21,7 +21,7 @@ use vulkano::descriptor::descriptor::DescriptorDescTy::TexelBuffer;
 use crate::canvas::canvas_frame::CanvasFrame;
 use std::hash::Hash;
 use crate::canvas::canvas_text::{CanvasText, CanvasTextHandle};
-use crate::canvas::canvas_shader::{GenericShader, CanvasShaderHandle, CompiledGraphicsPipelineHandle, CompiledGraphicsPipeline};
+use crate::canvas::canvas_shader::{GenericShader, CanvasShaderHandle, CompiledGraphicsPipelineHandle, CompiledGraphicsPipeline, ShaderType};
 use crate::canvas::canvas_buffer::{CanvasImage, CanvasTexture, CanvasTextCache};
 use crate::util::vertex_3d::Vertex3D;
 use vulkano::pipeline::depth_stencil::{StencilFaceFlags, DynamicStencilValue};
@@ -51,14 +51,6 @@ pub trait Drawable {
     }
 }
 
-/// Legacy ShaderType enum for single type shaders.
-#[derive(PartialEq, Eq, Hash, Clone)]
-pub enum ShaderType {
-    SOLID = 0,
-    TEXTURED = 1,
-    IMAGE = 2,
-}
-
 /// Typed wrapper for a u32 texture handle (index id)
 #[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]
 pub struct CanvasTextureHandle {
@@ -344,7 +336,6 @@ impl CanvasState {
     /// Takes physical and capabilities as we don't store that in Canvas
     pub fn load_shader(&mut self,
                        filename: String,
-                       shader_type: ShaderType,
                        physical: PhysicalDevice,
                        capabilities: Capabilities) -> Option<Arc<CompiledGraphicsPipelineHandle>> {