[vk] descriptor layout init

Author: sectopod

Cargo.toml

@@ -40,9 +40,6 @@ gfx_window_dxgi = { path = "src/window/dxgi", version = "0.2" }
 gfx_device_dx11 = { path = "src/backend/dx11", version = "0.2" }
 gfx_window_dxgi = { path = "src/window/dxgi", version = "0.2" }
 
-[[example]]
-name = "vk"
-
 [[example]]
 name = "blend"
 path = "examples/blend/main.rs"

examples/triangle/main.rs

@@ -15,7 +15,6 @@
 #[macro_use]
 extern crate gfx;
 extern crate gfx_window_glutin;
-extern crate gfx_device_gl;
 extern crate glutin;
 
 use gfx::traits::FactoryExt;

src/backend/gl/src/lib.rs

@@ -77,7 +77,7 @@ impl d::Resources for Resources {
 
 #[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
 pub struct BufferElement {
-    pub desc: d::pso::BufferDesc,
+    pub desc: d::pso::VertexBufferDesc,
     pub elem: d::pso::Element<d::format::Format>,
 }
 

src/backend/vulkan/src/data.rs

@@ -16,7 +16,7 @@ use gfx_core::factory::{Bind, MapAccess, Usage, LayerError};
 use gfx_core::format::{SurfaceType, ChannelType, Swizzle, ChannelSource};
 use gfx_core::pso::ColorInfo;
 use gfx_core::tex::{FilterMethod, Kind, Layer, PackedColor, WrapMode};
-use gfx_core::{state, Primitive};
+use gfx_core::{shade, state, Primitive};
 use vk;
 
 
@@ -410,3 +410,9 @@ pub fn map_blend(ci: &ColorInfo) -> vk::PipelineColorBlendAttachmentState {
             if ci.mask.contains(state::ALPHA) {vk::COLOR_COMPONENT_A_BIT} else {0},
     }
 }
+
+pub fn map_stage(usage: shade::Usage) -> vk::ShaderStageFlags {
+    (if usage.contains(shade::VERTEX)   { vk::SHADER_STAGE_VERTEX_BIT   } else { 0 }) |
+    (if usage.contains(shade::GEOMETRY) { vk::SHADER_STAGE_GEOMETRY_BIT } else { 0 }) |
+    (if usage.contains(shade::PIXEL)    { vk::SHADER_STAGE_FRAGMENT_BIT } else { 0 })
+}

src/backend/vulkan/src/factory.rs

@@ -393,12 +393,57 @@ impl core::Factory<R> for Factory {
         let (dev, vk) = self.share.get_device();
 
         let set_layout = {
+            let mut bindings = Vec::new();
+            for (i, cb) in desc.constant_buffers.iter().enumerate() {
+                if let &Some(usage) = cb {
+                    bindings.push(vk::DescriptorSetLayoutBinding {
+                        binding: i as u32,
+                        descriptorType: vk::DESCRIPTOR_TYPE_UNIFORM_BUFFER,
+                        descriptorCount: 1,
+                        stageFlags: data::map_stage(usage),
+                        pImmutableSamplers: ptr::null(),
+                    });
+                }
+            }
+            for (i, srv) in desc.resource_views.iter().enumerate() {
+                if let &Some(usage) = srv {
+                    bindings.push(vk::DescriptorSetLayoutBinding {
+                        binding: i as u32,
+                        descriptorType: vk::DESCRIPTOR_TYPE_SAMPLED_IMAGE,
+                        descriptorCount: 1,
+                        stageFlags: data::map_stage(usage),
+                        pImmutableSamplers: ptr::null(),
+                    });
+                }
+            }
+            for (i, uav) in desc.unordered_views.iter().enumerate() {
+                if let &Some(usage) = uav {
+                    bindings.push(vk::DescriptorSetLayoutBinding {
+                        binding: i as u32,
+                        descriptorType: vk::DESCRIPTOR_TYPE_STORAGE_IMAGE, //TODO: buffer views
+                        descriptorCount: 1,
+                        stageFlags: data::map_stage(usage),
+                        pImmutableSamplers: ptr::null(),
+                    });
+                }
+            }
+            for (i, sam) in desc.samplers.iter().enumerate() {
+                if let &Some(usage) = sam {
+                    bindings.push(vk::DescriptorSetLayoutBinding {
+                        binding: i as u32,
+                        descriptorType: vk::DESCRIPTOR_TYPE_SAMPLER,
+                        descriptorCount: 1,
+                        stageFlags: data::map_stage(usage),
+                        pImmutableSamplers: ptr::null(),
+                    });
+                }
+            }
             let info = vk::DescriptorSetLayoutCreateInfo {
                 sType: vk::STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
                 pNext: ptr::null(),
                 flags: 0,
-                bindingCount: 0,
-                pBindings: ptr::null(), //TODO
+                bindingCount: bindings.len() as u32,
+                pBindings: bindings.as_ptr(),
             };
             let mut out = 0;
             assert_eq!(vk::SUCCESS, unsafe {