piping everything through. Almost done

src/canvas/canvas_buffer.rs

@@ -1,4 +1,4 @@
-use crate::canvas::canvas_state::{CanvasTextureHandle, CanvasImageHandle};
+use crate::canvas::canvas_state::{CanvasTextureHandle, CanvasImageHandle, CanvasFontHandle};
 use vulkano::image::{ImmutableImage, AttachmentImage};
 use std::sync::Arc;
 use vulkano::format::{Format, R8Unorm};
@@ -7,7 +7,6 @@ use vulkano::descriptor::DescriptorSet;
 use vulkano::descriptor::descriptor_set::PersistentDescriptorSet;
 use vulkano::buffer::{CpuAccessibleBuffer, BufferAccess};
 use vulkano::pipeline::GraphicsPipelineAbstract;
-use crate::canvas::canvas_text::CanvasFontHandle;
 use rusttype::Font;
 
 #[derive(Clone)]
@@ -54,7 +53,7 @@ impl CanvasImage {
 
 #[derive(Clone)]
 pub struct CanvasFont {
-    pub(crate) handle: Arc<CanvasImageHandle>,
+    pub(crate) handle: Arc<CanvasFontHandle>,
     pub(crate) buffer: Arc<(dyn BufferAccess + Send + Sync)>, // Font atlas
     pub(crate) font: Font<'static>,
     pub(crate) name: String,