idk man

src/vulkan/pipelines.rs

@@ -1,6 +1,6 @@
 use std::{convert::TryInto, io::{self, ErrorKind, Read, Write}, path::PathBuf, sync::Arc};
 
-use vulkano::{command_buffer::AutoCommandBufferBuilder, descriptor::{DescriptorSet, descriptor::ShaderStages, descriptor_set::PersistentDescriptorSet}, pipeline::{shader::{ShaderModule}}};
+use vulkano::{command_buffer::AutoCommandBufferBuilder, descriptor::{DescriptorSet, descriptor::ShaderStages, descriptor_set::PersistentDescriptorSet, pipeline_layout::PipelineLayoutDesc}, pipeline::{shader::{ShaderModule}}};
 use vulkano::command_buffer::DynamicState;
 use vulkano::device::Device;
 use vulkano::framebuffer::RenderPassAbstract;
@@ -22,7 +22,7 @@ type DS = Arc<dyn DescriptorSet + Send + Sync>;
 
 pub trait Drawcall {
     fn draw(self: &Self, builder: &mut AutoCommandBufferBuilder, fb_index: usize, game_objects: Vec<&GameObject>, game_data: &GameData, dynamic_state: &DynamicState);
-    fn create_descriptor_set(self: &Self, textures: &Vec<TextureHandle>, renderer: &VulkanRenderer) -> Vec<DS>;
+    fn create_descriptor_sets(self: &Self, textures: &Vec<TextureHandle>, renderer: &VulkanRenderer) -> Vec<Vec<DS>>;
     fn recreate_pipeline(self: &mut Self, device: Arc<Device>, render_pass: RP);
     fn get_pipeline(self: &Self) -> &GP;
 }
@@ -155,24 +155,23 @@ impl Drawcall for DefaultShader {
         }
     }
 
-    fn create_descriptor_set(self: &Self, textures: &Vec<TextureHandle>, renderer: &VulkanRenderer) -> Vec<DS> {
-        let descriptor_set_layout = self.get_pipeline().descriptor_set_layout(0).unwrap().clone();
+    fn create_descriptor_sets(self: &Self, textures: &Vec<TextureHandle>, renderer: &VulkanRenderer) -> Vec<Vec<DS>> {
+        let descriptor_set_layout_0 = self.get_pipeline().descriptor_set_layout(0).unwrap().clone();
 
         renderer.uniform_buffers.iter().map(|uniform_buffer| {
-            let descriptor_set: Arc<(dyn vulkano::descriptor::DescriptorSet + std::marker::Send + std::marker::Sync + 'static)>;
-            let builder = PersistentDescriptorSet::start(descriptor_set_layout.clone());
+            let descriptor_set_0: Arc<(dyn vulkano::descriptor::DescriptorSet + std::marker::Send + std::marker::Sync + 'static)>;
             
             debug_assert!(textures.len() == 2, "Expected diffuse and normal map for object shader!");
             let diffuse = &renderer.game_data.textures[textures[0]];
             let normal_map = &renderer.game_data.textures[textures[1]];
 
-            descriptor_set = Arc::new(builder
+            descriptor_set_0 = Arc::new(PersistentDescriptorSet::start(descriptor_set_layout_0.clone())
                 .add_buffer(uniform_buffer.clone()).unwrap()
                 .add_sampled_image(diffuse.image.clone(), diffuse.sampler.clone()).unwrap()
                 .add_sampled_image(normal_map.image.clone(), normal_map.sampler.clone()).unwrap()
                 .build().unwrap());
 
-            descriptor_set
+            vec![descriptor_set_0]
         }).collect()
     }
 
@@ -240,7 +239,7 @@ impl Drawcall for LineShader {
             game_data.line_push_constants.clone()).unwrap();
     }
 
-    fn create_descriptor_set(self: &Self, _textures: &Vec<TextureHandle>, _renderer: &VulkanRenderer) -> Vec<DS> {
+    fn create_descriptor_sets(self: &Self, _textures: &Vec<TextureHandle>, _renderer: &VulkanRenderer) -> Vec<Vec<DS>> {
         vec![]
     }
 
@@ -318,6 +317,10 @@ impl TextShader {
                 .build(device.clone())
                 .unwrap());
 
+            println!("{:?}", gp.descriptor(0, 0).unwrap().ty);
+            println!("{:?}", gp.descriptor(0, 1).unwrap().ty);
+            println!("{:?}", gp.descriptor(0, 2).unwrap().ty); // TODO: Why does this exist?
+
             gp
         }
     }
@@ -340,24 +343,27 @@ impl Drawcall for TextShader {
         }
     }
 
-    fn create_descriptor_set(self: &Self, textures: &Vec<TextureHandle>, renderer: &VulkanRenderer) -> Vec<DS> {
+    fn create_descriptor_sets(self: &Self, textures: &Vec<TextureHandle>, renderer: &VulkanRenderer) -> Vec<Vec<DS>> {
         let descriptor_set_layout = self.get_pipeline().descriptor_set_layout(0).unwrap().clone();
 
         renderer.uniform_buffers.iter().map(|uniform_buffer| {
             let descriptor_set: Arc<(dyn vulkano::descriptor::DescriptorSet + std::marker::Send + std::marker::Sync + 'static)>;
             let builder = PersistentDescriptorSet::start(descriptor_set_layout.clone());
 
-            debug_assert!(textures.len() == 1, "Expected only diffuse map for text shader!");
-            let diffuse = &renderer.game_data.textures[textures[0]];
-            println!("Using diffuse image with size {:?}", diffuse.image.dimensions());
+            let diffuse_index = match textures.len() {
+                0 => 0,
+                1 => textures[0],
+                _ => panic!("Expected only diffuse map for text shader!"),
+            };
+            let diffuse = &renderer.game_data.textures[diffuse_index];
 
             descriptor_set = Arc::new(builder
                 .add_buffer(uniform_buffer.clone()).unwrap()
                 .add_sampled_image(diffuse.image.clone(), diffuse.sampler.clone()).unwrap()
-                .add_sampled_image(diffuse.image.clone(), diffuse.sampler.clone()).unwrap()
+                .add_sampled_image(diffuse.image.clone(), diffuse.sampler.clone()).unwrap() // TODO: delet this
                 .build().unwrap());
 
-            descriptor_set
+            vec![descriptor_set]
         }).collect()
     }