Merge pull request #2035 from KhronosGroup/fix-2032
HLSL: Improve support for VertexInfo aux struct.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8ea49a..cf14c8d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -332,7 +332,7 @@
endif()
set(spirv-cross-abi-major 0)
-set(spirv-cross-abi-minor 49)
+set(spirv-cross-abi-minor 50)
set(spirv-cross-abi-patch 0)
if (SPIRV_CROSS_SHARED)
diff --git a/main.cpp b/main.cpp
index 8fe81c7..7f7bda4 100644
--- a/main.cpp
+++ b/main.cpp
@@ -536,6 +536,7 @@
print_resources(compiler, "push", res.push_constant_buffers);
print_resources(compiler, "counters", res.atomic_counters);
print_resources(compiler, "acceleration structures", res.acceleration_structures);
+ print_resources(compiler, "record buffers", res.shader_record_buffers);
print_resources(compiler, spv::StorageClassInput, res.builtin_inputs);
print_resources(compiler, spv::StorageClassOutput, res.builtin_outputs);
}
diff --git a/spirv_cross.cpp b/spirv_cross.cpp
index 3f30ee9..e8c5772 100644
--- a/spirv_cross.cpp
+++ b/spirv_cross.cpp
@@ -991,6 +991,10 @@
// in the future.
res.push_constant_buffers.push_back({ var.self, var.basetype, type.self, get_name(var.self) });
}
+ else if (type.storage == StorageClassShaderRecordBufferKHR)
+ {
+ res.shader_record_buffers.push_back({ var.self, var.basetype, type.self, get_remapped_declared_block_name(var.self, ssbo_instance_name) });
+ }
// Images
else if (type.storage == StorageClassUniformConstant && type.basetype == SPIRType::Image &&
type.image.sampled == 2)
diff --git a/spirv_cross.hpp b/spirv_cross.hpp
index f1c347d..53c8b65 100644
--- a/spirv_cross.hpp
+++ b/spirv_cross.hpp
@@ -99,6 +99,8 @@
// but keep the vector in case this restriction is lifted in the future.
SmallVector<Resource> push_constant_buffers;
+ SmallVector<Resource> shader_record_buffers;
+
// For Vulkan GLSL and HLSL source,
// these correspond to separate texture2D and samplers respectively.
SmallVector<Resource> separate_images;
diff --git a/spirv_cross_c.cpp b/spirv_cross_c.cpp
index 2d9401b..011d127 100644
--- a/spirv_cross_c.cpp
+++ b/spirv_cross_c.cpp
@@ -194,6 +194,7 @@
SmallVector<spvc_reflected_resource> sampled_images;
SmallVector<spvc_reflected_resource> atomic_counters;
SmallVector<spvc_reflected_resource> push_constant_buffers;
+ SmallVector<spvc_reflected_resource> shader_record_buffers;
SmallVector<spvc_reflected_resource> separate_images;
SmallVector<spvc_reflected_resource> separate_samplers;
SmallVector<spvc_reflected_resource> acceleration_structures;
@@ -1684,6 +1685,8 @@
return false;
if (!copy_resources(push_constant_buffers, resources.push_constant_buffers))
return false;
+ if (!copy_resources(shader_record_buffers, resources.shader_record_buffers))
+ return false;
if (!copy_resources(separate_images, resources.separate_images))
return false;
if (!copy_resources(separate_samplers, resources.separate_samplers))
@@ -1837,6 +1840,10 @@
list = &resources->acceleration_structures;
break;
+ case SPVC_RESOURCE_TYPE_SHADER_RECORD_BUFFER:
+ list = &resources->shader_record_buffers;
+ break;
+
default:
break;
}
diff --git a/spirv_cross_c.h b/spirv_cross_c.h
index 4e6c639..8943487 100644
--- a/spirv_cross_c.h
+++ b/spirv_cross_c.h
@@ -40,7 +40,7 @@
/* Bumped if ABI or API breaks backwards compatibility. */
#define SPVC_C_API_VERSION_MAJOR 0
/* Bumped if APIs or enumerations are added in a backwards compatible way. */
-#define SPVC_C_API_VERSION_MINOR 49
+#define SPVC_C_API_VERSION_MINOR 50
/* Bumped if internal implementation details change. */
#define SPVC_C_API_VERSION_PATCH 0
@@ -225,6 +225,7 @@
SPVC_RESOURCE_TYPE_SEPARATE_SAMPLERS = 11,
SPVC_RESOURCE_TYPE_ACCELERATION_STRUCTURE = 12,
SPVC_RESOURCE_TYPE_RAY_QUERY = 13,
+ SPVC_RESOURCE_TYPE_SHADER_RECORD_BUFFER = 14,
SPVC_RESOURCE_TYPE_INT_MAX = 0x7fffffff
} spvc_resource_type;
diff --git a/spirv_msl.cpp b/spirv_msl.cpp
index f870444..b974b66 100644
--- a/spirv_msl.cpp
+++ b/spirv_msl.cpp
@@ -856,7 +856,7 @@
swizzle_buffer_id = var_id;
}
- if (!buffers_requiring_array_length.empty())
+ if (needs_buffer_size_buffer())
{
uint32_t var_id = build_constant_uint_array_pointer();
set_name(var_id, "spvBufferSizeConstants");
@@ -10021,7 +10021,7 @@
decl += join(", constant uint", arg_is_array ? "* " : "& ", to_swizzle_expression(arg.id));
}
- if (buffers_requiring_array_length.count(name_id))
+ if (buffer_requires_array_length(name_id))
{
bool arg_is_array = !arg_type.array.empty();
decl += join(", constant uint", arg_is_array ? "* " : "& ", to_buffer_size_expression(name_id));
@@ -11058,7 +11058,7 @@
else if (msl_options.swizzle_texture_samples && has_sampled_images && is_sampled_image_type(type))
arg_str += ", " + to_swizzle_expression(var_id ? var_id : id);
- if (buffers_requiring_array_length.count(var_id))
+ if (buffer_requires_array_length(var_id))
arg_str += ", " + to_buffer_size_expression(var_id ? var_id : id);
if (is_dynamic_img_sampler)
@@ -12767,7 +12767,7 @@
else if ((var.storage == StorageClassStorageBuffer || (var.storage == StorageClassUniform && ssbo)) &&
!is_hidden_variable(var))
{
- if (buffers_requiring_array_length.count(var.self))
+ if (buffer_requires_array_length(var.self))
{
entry_func.fixup_hooks_in.push_back([this, &type, &var, var_id]() {
bool is_array_type = !type.array.empty();
@@ -16710,7 +16710,7 @@
// Check if this descriptor set needs a swizzle buffer.
if (needs_swizzle_buffer_def && is_sampled_image_type(type))
set_needs_swizzle_buffer[desc_set] = true;
- else if (buffers_requiring_array_length.count(var_id) != 0)
+ else if (buffer_requires_array_length(var_id))
{
set_needs_buffer_sizes[desc_set] = true;
needs_buffer_sizes = true;
diff --git a/spirv_msl.hpp b/spirv_msl.hpp
index 1a7ee5c..a848f9b 100644
--- a/spirv_msl.hpp
+++ b/spirv_msl.hpp
@@ -504,6 +504,11 @@
return !buffers_requiring_array_length.empty();
}
+ bool buffer_requires_array_length(VariableID id) const
+ {
+ return buffers_requiring_array_length.count(id) != 0;
+ }
+
// Provide feedback to calling API to allow it to pass a buffer
// containing the view mask for the current multiview subpass.
bool needs_view_mask_buffer() const
