spirv-cross 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2441261f9f58a2fc569cfa3fab88a9a6ecc9666514e89d5a559a55f83f6b9487
-  data.tar.gz: 4545b775ac721125cdbf1af53377a1ce26c5924cf6957ce1d47c3f9180788537
+  metadata.gz: 06b40e36f910e035b20458c5088f1946b7d6307321d5b0b73235d9681acaeec4
+  data.tar.gz: 57a90fa0a95cd82aebb6fbd2db1ca14ddc011bc1113434991f4ce8fc368d812c
 SHA512:
-  metadata.gz: c9ae1805ee23b5c02c047dbb39820e9a1990fef23357fe26d7eaeabbaa8c16a1e1c5fd4a68489d2628ca01ea3d177f8cbe66e27a8408e4316eaa31a9192d0d8d
-  data.tar.gz: 9aa286c888bbda09f8f56d29a0a5bd728295d1e1ea65235d88988f3a415a4436c54e5797a26f1d5453eb77416a2d98f6958721959a7385d0bcd299efc4f76940
+  metadata.gz: 258c51a5d07e42dc6bc44a0e8161f42f9a146e8d76583e3b8d958294dcf21102ab4959d550e642a488b14d858b891ce9ce524c7001724eb05ce46c752d8c381f
+  data.tar.gz: 694ed022139b8ad9d90ffdbccd91d2cb06128a9495b2811a2103730ead7a9b8e2e36b2691238c1db2b4fde9d1827bf65bbcc0e357c7525ebbeb2fbf0c217a880

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spirv-cross (0.1.2)
+    spirv-cross (0.1.3)
 
 GEM
   remote: https://rubygems.org/
@@ -22,4 +22,4 @@ DEPENDENCIES
   spirv-cross!
 
 BUNDLED WITH
-   2.1.1
+   2.1.2

data/ext/spirv_cross/rb_spvx_compiler.cpp

@@ -179,11 +179,9 @@ extern "C" {
     return vres;
   }
 
-  VALUE shader_resource_vector_to_ary(spirv_cross::Compiler &compiler, spirv_cross::SmallVector<spirv_cross::Resource> &vec, bool print_ssbo) {
+  VALUE shader_resource_vector_to_ary(spirv_cross::Compiler &compiler, spirv_cross::SmallVector<spirv_cross::Resource> &vec, bool print_ssbo, bool is_buffer) {
     VALUE ret = rb_ary_new();
-    for (size_t i = 0; i < vec.size(); i++) {
-      spirv_cross::Resource &res = vec[i];
-
+    for (auto &res : vec) {
       // just merge extra data into the type hash instead of creating a nested type hash
       VALUE vres = rb_spirv_type(compiler, res.type_id);
 
@@ -193,23 +191,27 @@ extern "C" {
       // // rb_hash_aset(vres, ID2SYM(rb_intern("base_type")), rb_spirv_type(compiler, res.base_type_id));
       // rb_hash_aset(vres, ID2SYM(rb_intern("type")), rb_spirv_type(compiler, res.type_id));
 
-      spirv_cross::SmallVector<spirv_cross::BufferRange> ranges = compiler.get_active_buffer_ranges(res.id);
-      VALUE vranges = rb_ary_new();
-      rb_hash_aset(vres, ID2SYM(rb_intern("active_buffer_ranges")), vranges);
-      for (auto &range : ranges) {
-        VALUE vrange = rb_hash_new();
-        rb_hash_aset(vrange, ID2SYM(rb_intern("index")),  UINT2NUM(range.index));
-        rb_hash_aset(vrange, ID2SYM(rb_intern("offset")), SIZET2NUM(range.offset));
-        rb_hash_aset(vrange, ID2SYM(rb_intern("size")),   SIZET2NUM(range.range));
-        rb_ary_push(vranges, vrange);
+      // This can be used for Buffer (UBO), BufferBlock/StorageBuffer (SSBO) and PushConstant blocks.
+      if (is_buffer) {
+        auto ranges = compiler.get_active_buffer_ranges(res.id);
+        VALUE vranges = rb_ary_new();
+        rb_hash_aset(vres, ID2SYM(rb_intern("active_buffer_ranges")), vranges);
+        for (auto &range : ranges) {
+          VALUE vrange = rb_hash_new();
+          rb_hash_aset(vrange, ID2SYM(rb_intern("index")),  UINT2NUM(range.index));
+          rb_hash_aset(vrange, ID2SYM(rb_intern("offset")), SIZET2NUM(range.offset));
+          rb_hash_aset(vrange, ID2SYM(rb_intern("size")),   SIZET2NUM(range.range));
+          rb_ary_push(vranges, vrange);
+        }
       }
 
       auto &type = compiler.get_type(res.type_id);
 
       /* The following code was basically lifted from spirv-cross/main.cpp */
 
-      if (print_ssbo && compiler.buffer_is_hlsl_counter_buffer(res.id))
+      if (print_ssbo && compiler.buffer_is_hlsl_counter_buffer(res.id)) {
         continue;
+      }
 
       // If we don't have a name, use the fallback for the type instead of the variable
       // for SSBOs and UBOs since those are the only meaningful names to use externally.
@@ -232,18 +234,20 @@ extern "C" {
       }
 
       spirv_cross::Bitset mask;
-      if (print_ssbo)
+      if (print_ssbo) {
         mask = compiler.get_buffer_block_flags(res.id);
-      else
+      } else {
         mask = compiler.get_decoration_bitset(res.id);
+      }
 
       VALUE ary = rb_ary_new();
       rb_hash_aset(vres, ID2SYM(rb_intern("array_sizes")), ary);
       for (size_t j = 0; j < type.array.size(); j++) {
-        if (type.array_size_literal[j])
+        if (type.array_size_literal[j]) {
           rb_ary_push(ary, UINT2NUM(type.array[j]));
-        else
+        } else {
           rb_ary_push(ary, ID2SYM(rb_intern("expression")));
+        }
       }
 
       rb_hash_aset(vres, ID2SYM(rb_intern("name")),
@@ -266,13 +270,15 @@ extern "C" {
       if (is_sized_block)
       {
         rb_hash_aset(vres, ID2SYM(rb_intern("block_size")), UINT2NUM(block_size));
-        if (runtime_array_stride)
+        if (runtime_array_stride) {
           rb_hash_aset(vres, ID2SYM(rb_intern("unsized_array_stride")), UINT2NUM(runtime_array_stride));
+        }
       }
 
       uint32_t counter_id = 0;
-      if (print_ssbo && compiler.buffer_get_hlsl_counter_buffer(res.id, counter_id))
+      if (print_ssbo && compiler.buffer_get_hlsl_counter_buffer(res.id, counter_id)) {
         rb_hash_aset(vres, ID2SYM(rb_intern("hlsl_counter_buffer_id")), UINT2NUM(counter_id));
+      }
 
       rb_ary_push(ret, vres);
     }
@@ -281,19 +287,19 @@ extern "C" {
 
   inline VALUE shader_resources_to_hash(spirv_cross::Compiler *comp, spirv_cross::ShaderResources &resources) {
     VALUE vsr = rb_hash_new();
-    #define HASH_PUSH_RESOURCE_ARY(name, ssbo) \
-      rb_hash_aset(vsr, ID2SYM(rb_intern(#name)), shader_resource_vector_to_ary(*comp, resources.name, ssbo));
-    HASH_PUSH_RESOURCE_ARY(uniform_buffers,       false);
-    HASH_PUSH_RESOURCE_ARY(storage_buffers,       true);
-    HASH_PUSH_RESOURCE_ARY(stage_inputs,          false);
-    HASH_PUSH_RESOURCE_ARY(stage_outputs,         false);
-    HASH_PUSH_RESOURCE_ARY(subpass_inputs,        false);
-    HASH_PUSH_RESOURCE_ARY(storage_images,        false);
-    HASH_PUSH_RESOURCE_ARY(sampled_images,        false);
-    HASH_PUSH_RESOURCE_ARY(atomic_counters,       false);
-    HASH_PUSH_RESOURCE_ARY(push_constant_buffers, false);
-    HASH_PUSH_RESOURCE_ARY(separate_images,       false);
-    HASH_PUSH_RESOURCE_ARY(separate_samplers,     false);
+    #define HASH_PUSH_RESOURCE_ARY(name, ssbo, is_buffer) \
+      rb_hash_aset(vsr, ID2SYM(rb_intern(#name)), shader_resource_vector_to_ary(*comp, resources.name, ssbo, is_buffer));
+    HASH_PUSH_RESOURCE_ARY(uniform_buffers,       false, true);
+    HASH_PUSH_RESOURCE_ARY(storage_buffers,       true,  true);
+    HASH_PUSH_RESOURCE_ARY(stage_inputs,          false, false);
+    HASH_PUSH_RESOURCE_ARY(stage_outputs,         false, false);
+    HASH_PUSH_RESOURCE_ARY(subpass_inputs,        false, false);
+    HASH_PUSH_RESOURCE_ARY(storage_images,        false, false);
+    HASH_PUSH_RESOURCE_ARY(sampled_images,        false, false);
+    HASH_PUSH_RESOURCE_ARY(atomic_counters,       false, false);
+    HASH_PUSH_RESOURCE_ARY(push_constant_buffers, false, true);
+    HASH_PUSH_RESOURCE_ARY(separate_images,       false, false);
+    HASH_PUSH_RESOURCE_ARY(separate_samplers,     false, false);
     return vsr;
   }
 

data/lib/spirv/cross/version.rb

@@ -1,5 +1,5 @@
 module SPIRV
   module Cross
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spirv-cross
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Colin MacKenzie IV
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2020-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for SPIRV-Cross to provide reflection of SPIR-V shaders.