Bindless

Traverse-Research · Oct 2, 2020 · e0fbb20 · e0fbb20
1 parent ab4845b
commit e0fbb20
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/tests/glsl.rs b/tests/glsl.rs
@@ -87,14 +87,23 @@ fn glsl_bindings() {
         }
     );
 
-    // assert_eq!(
-    //     sets[&4][&0],
-    //     DescriptorInfo {
-    //         name: "g_bindlessrwimage2d".to_string(),
-    //         ty: DescriptorType::STORAGE_IMAGE,
-    //         is_bindless: true
-    //     }
-    // );
+    assert_eq!(
+        sets[&4][&0],
+        DescriptorInfo {
+            name: "g_bindlessrwimage2d".to_string(),
+            ty: DescriptorType::STORAGE_IMAGE,
+            is_bindless: true
+        }
+    );
+
+    assert_eq!(
+        sets[&4][&1],
+        DescriptorInfo {
+            name: "g_bindlesstexture2d".to_string(),
+            ty: DescriptorType::SAMPLED_IMAGE,
+            is_bindless: true
+        }
+    );
 
     assert_eq!(
         sets[&5][&0],

diff --git a/tests/shader-glsl.spv b/tests/shader-glsl.spv
diff --git a/tests/shader.comp b/tests/shader.comp
@@ -38,6 +38,9 @@ layout(set = 2, binding = 2, rgba32f) uniform image2D g_rwimage2d;
 
 layout(set = 3, binding = 0) uniform texture2D g_texture2d;
 
+layout(set = 4, binding = 0, rgba32f) uniform image2D g_bindlessrwimage2d[];
+layout(set = 4, binding = 1) uniform texture2D g_bindlesstexture2d[];
+
 layout(set = 5, binding = 0) uniform sampler2D g_samplerimage2d;
 
 layout(set = 6, binding = 0, rgba32f) uniform imageBuffer g_imagebuffer;