running. Rust is absolutley amazing. I haven't run this in ~20 commits, yet it only took a few unwrap() fixes and it's back working

src/canvas.rs

@@ -238,8 +238,11 @@ impl CanvasState {
     }
 
     pub fn create_image(&mut self, dimensions: (u32, u32), usage: ImageUsage) -> Arc<CanvasImageHandle> {
+
+        let handle = Arc::new(CanvasImageHandle { handle: self.image_buffers.len() as u32});
+
         let image = CanvasImage {
-            handle: Arc::new(CanvasImageHandle { handle: self.image_buffers.len() as u32 + 1 }),
+            handle: handle.clone(),
             buffer: AttachmentImage::with_usage(
                 self.device.clone(),
                 [dimensions.0, dimensions.1],
@@ -247,8 +250,9 @@ impl CanvasState {
                 usage).unwrap(),
             size: dimensions,
         };
-        let handle = image.handle.clone();
+
         self.image_buffers.push(Arc::new(image));
+
         handle
     }
 
@@ -303,7 +307,7 @@ impl CanvasState {
         let texture_buffer = self.get_texture_from_file(filename.clone());
 
         let handle = Arc::new(CanvasTextureHandle {
-            handle: self.texture_buffers.len() as u32 + 1
+            handle: self.texture_buffers.len() as u32
         });
 
         let texture = Arc::new(CanvasTexture {