split the texture's sampler and its image view into separaet bindings HEAD main

this will make it easier to change the image view dynamically as a push update, in a future CL

Force-Push: yes
Change-Id: If7cfab07913a5a462e16dd7fb478ed491d33d4d9

1 files changed, 8 insertions, 2 deletions

diff --git a/src/graphics/permanent.rs b/src/graphics/permanent.rs
index df86284..b39dbdd 100644
--- a/src/graphics/permanent.rs
+++ b/src/graphics/permanent.rs
@@ -575,11 +575,17 @@ fn init_descriptor_set_layout(device: &Device)
 
   let sampler_binding = vk::DescriptorSetLayoutBinding::builder()
           .binding(1)
-          .descriptor_type(vk::DescriptorType::COMBINED_IMAGE_SAMPLER)
+          .descriptor_type(vk::DescriptorType::SAMPLER)
           .descriptor_count(1)
           .stage_flags(vk::ShaderStageFlags::FRAGMENT);
 
-  let bindings = [uniform_block_binding, sampler_binding];
+  let texture_binding = vk::DescriptorSetLayoutBinding::builder()
+          .binding(2)
+          .descriptor_type(vk::DescriptorType::SAMPLED_IMAGE)
+          .descriptor_count(1)
+          .stage_flags(vk::ShaderStageFlags::FRAGMENT);
+
+  let bindings = [uniform_block_binding, sampler_binding, texture_binding];
   let descriptor_set_layout_info
           = vk::DescriptorSetLayoutCreateInfo::builder()
                 .bindings(&bindings);