Merge pull request #1 from WhyAreAllTheseTaken/add-other-shader-resou…

…rces Add missing resources types to ShaderResources.
chyyran · Jul 29, 2024 · 7e59bfe · 7e59bfe
2 parents 9fa96a9 + e756b3f
commit 7e59bfe
Show file tree

Hide file tree

Showing 6 changed files with 161 additions and 140 deletions.
diff --git a/spirv_cross/src/bindings_native.rs b/spirv_cross/src/bindings_native.rs
diff --git a/spirv_cross/src/bindings_wasm.rs b/spirv_cross/src/bindings_wasm.rs
diff --git a/spirv_cross/src/compiler.rs b/spirv_cross/src/compiler.rs
@@ -669,8 +669,11 @@ impl<TTargetData> Compiler<TTargetData> {
             let storage_images = fill_resources(&shader_resources_raw.storage_images)?;
             let sampled_images = fill_resources(&shader_resources_raw.sampled_images)?;
             let atomic_counters = fill_resources(&shader_resources_raw.atomic_counters)?;
+            let acceleration_structures = fill_resources(&shader_resources_raw.acceleration_structures)?;
+            let gl_plain_uniforms = fill_resources(&shader_resources_raw.gl_plain_uniforms)?;
             let push_constant_buffers =
                 fill_resources(&shader_resources_raw.push_constant_buffers)?;
+            let shader_record_buffers = fill_resources(&shader_resources_raw.shader_record_buffers)?;
             let separate_images = fill_resources(&shader_resources_raw.separate_images)?;
             let separate_samplers = fill_resources(&shader_resources_raw.separate_samplers)?;
 
@@ -686,6 +689,9 @@ impl<TTargetData> Compiler<TTargetData> {
                 push_constant_buffers,
                 separate_images,
                 separate_samplers,
+                acceleration_structures,
+                gl_plain_uniforms,
+                shader_record_buffers,
             })
         }
     }

diff --git a/spirv_cross/src/spirv.rs b/spirv_cross/src/spirv.rs
@@ -337,7 +337,10 @@ pub struct ShaderResources {
     pub storage_images: Vec<Resource>,
     pub sampled_images: Vec<Resource>,
     pub atomic_counters: Vec<Resource>,
+    pub acceleration_structures: Vec<Resource>,
+    pub gl_plain_uniforms: Vec<Resource>,
     pub push_constant_buffers: Vec<Resource>,
+    pub shader_record_buffers: Vec<Resource>,
     pub separate_images: Vec<Resource>,
     pub separate_samplers: Vec<Resource>,
 }

diff --git a/spirv_cross/src/wrapper.cpp b/spirv_cross/src/wrapper.cpp
@@ -410,9 +410,12 @@ extern "C"
                 fill_resource_array(&shader_resources->storage_images, sc_resources.storage_images);
                 fill_resource_array(&shader_resources->sampled_images, sc_resources.sampled_images);
                 fill_resource_array(&shader_resources->atomic_counters, sc_resources.atomic_counters);
+                fill_resource_array(&shader_resources->acceleration_structures, sc_resources.acceleration_structures);
+                fill_resource_array(&shader_resources->gl_plain_uniforms, sc_resources.gl_plain_uniforms);
                 fill_resource_array(&shader_resources->push_constant_buffers, sc_resources.push_constant_buffers);
                 fill_resource_array(&shader_resources->separate_images, sc_resources.separate_images);
                 fill_resource_array(&shader_resources->separate_samplers, sc_resources.separate_samplers);
+                fill_resource_array(&shader_resources->shader_record_buffers, sc_resources.shader_record_buffers);
             } while (0);)
     }
 

diff --git a/spirv_cross/src/wrapper.hpp b/spirv_cross/src/wrapper.hpp
@@ -156,7 +156,10 @@ extern "C"
         ScResourceArray storage_images;
         ScResourceArray sampled_images;
         ScResourceArray atomic_counters;
+        ScResourceArray acceleration_structures; 
+        ScResourceArray gl_plain_uniforms; 
         ScResourceArray push_constant_buffers;
+        ScResourceArray shader_record_buffers;
         ScResourceArray separate_images;
         ScResourceArray separate_samplers;
     } ScShaderResources;