moved to rust style file tree

src/canvas/canvas_buffer.rs

@@ -0,0 +1,95 @@
+use crate::canvas::canvas_state::{CanvasTextureHandle, CanvasImageHandle};
+use vulkano::image::{ImmutableImage, AttachmentImage};
+use std::sync::Arc;
+use vulkano::format::{Format, R8Unorm};
+use crate::canvas::canvas_shader::CanvasShader;
+use vulkano::sampler::Sampler;
+use vulkano::descriptor::DescriptorSet;
+use vulkano::descriptor::descriptor_set::PersistentDescriptorSet;
+use vulkano::buffer::CpuAccessibleBuffer;
+use crate::canvas::canvas_text::{CanvasTextCacheHandle, CanvasTextHandle};
+
+#[derive(Clone)]
+pub struct CanvasTexture {
+    pub(crate) handle: Arc<CanvasTextureHandle>,
+    pub(crate) buffer: Arc<ImmutableImage<Format>>,
+    pub(crate) name: String,
+    pub(crate) size: (u32, u32),
+}
+
+impl CanvasTexture {
+    pub fn get_descriptor_set(&self,
+                              shader: Arc<CanvasShader>,
+                              sampler: Arc<Sampler>) -> Box<dyn DescriptorSet + Send + Sync> {
+        let o: Box<dyn DescriptorSet + Send + Sync> = Box::new(
+            PersistentDescriptorSet::start(
+                shader.clone().get_pipeline().clone(), 0,
+            )
+                .add_sampled_image(self.buffer.clone(), sampler.clone()).unwrap()
+                .build().unwrap());
+        o
+    }
+}
+
+#[derive(Clone)]
+pub struct CanvasImage {
+    pub(crate) handle: Arc<CanvasImageHandle>,
+    pub(crate) buffer: Arc<AttachmentImage>,
+    pub(crate) size: (u32, u32),
+}
+
+impl CanvasImage {
+    pub fn get_descriptor_set(&self, shader: Arc<CanvasShader>)
+                              -> Box<dyn DescriptorSet + Send + Sync> {
+        let o: Box<dyn DescriptorSet + Send + Sync> = Box::new(
+            PersistentDescriptorSet::start(
+                shader.clone().get_pipeline().clone(), 0,
+            )
+                .add_image(self.buffer.clone()).unwrap()
+                .build().unwrap());
+        o
+    }
+}
+
+#[derive(Clone)]
+pub struct CanvasTextCache {
+    pub(crate) handle: Arc<CanvasTextCacheHandle>,
+    pub(crate) buffer: Arc<CpuAccessibleBuffer<u8>>,
+    pub(crate) size: (u32, u32),
+}
+
+impl CanvasTextCache {
+    pub fn get_descriptor_set(&self,
+                              shader: Arc<CanvasShader>,
+                              sampler: Arc<Sampler>) -> Box<dyn DescriptorSet + Send + Sync> {
+        let o: Box<dyn DescriptorSet + Send + Sync> = Box::new(
+            PersistentDescriptorSet::start(
+                shader.clone().get_pipeline().clone(), 0,
+            )
+                .add_buffer(self.buffer.clone()).unwrap()
+                .build().unwrap());
+        o
+    }
+}
+
+
+#[derive(Clone)]
+pub struct CanvasText {
+    pub(crate) handle: Arc<CanvasTextHandle>,
+    pub(crate) buffer: Arc<ImmutableImage<R8Unorm>>,
+    pub(crate) size: (u32, u32),
+}
+
+impl CanvasText {
+    pub fn get_descriptor_set(&self,
+                              shader: Arc<CanvasShader>,
+                              sampler: Arc<Sampler>) -> Box<dyn DescriptorSet + Send + Sync> {
+        let o: Box<dyn DescriptorSet + Send + Sync> = Box::new(
+            PersistentDescriptorSet::start(
+                shader.clone().get_pipeline().clone(), 0,
+            )
+                .add_sampled_image(self.buffer.clone(), sampler.clone()).unwrap()
+                .build().unwrap());
+        o
+    }
+}