Skip to content

Commit 90add1d

Browse files
Fix order of ByteAddressBuffer offsets in YAML (#275)
1 parent 1d674a8 commit 90add1d

File tree

4 files changed

+47
-5
lines changed

4 files changed

+47
-5
lines changed

tests/test-spirv-reflect.cpp

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -792,18 +792,41 @@ TEST_P(SpirvReflectTest, CheckYamlOutput) {
792792
}
793793

794794
namespace {
795+
// TODO - have this glob search all .spv files
795796
const std::vector<const char*> all_spirv_paths = {
796797
// clang-format off
798+
"../tests/16bit/vert_in_out_16.spv",
797799
"../tests/access_chains/array_length_from_access_chain.spv",
798800
"../tests/cbuffer_unused/cbuffer_unused_001.spv",
799801
"../tests/glsl/built_in_format.spv",
802+
"../tests/entry_exec_mode/comp_local_size.spv",
803+
"../tests/entry_exec_mode/geom_inv_out_vert.spv",
804+
"../tests/execution_mode/local_size_id_spec.spv",
805+
"../tests/execution_mode/local_size_id.spv",
806+
"../tests/glsl/buffer_handle_0.spv",
807+
"../tests/glsl/buffer_handle_1.spv",
808+
"../tests/glsl/buffer_handle_2.spv",
809+
"../tests/glsl/buffer_handle_3.spv",
810+
"../tests/glsl/buffer_handle_4.spv",
811+
"../tests/glsl/buffer_handle_5.spv",
812+
"../tests/glsl/buffer_handle_6.spv",
813+
"../tests/glsl/buffer_handle_7.spv",
814+
"../tests/glsl/buffer_handle_8.spv",
815+
"../tests/glsl/buffer_handle_9.spv",
816+
"../tests/glsl/buffer_handle_uvec2_pc.spv",
817+
"../tests/glsl/buffer_handle_uvec2_ssbo.spv",
800818
"../tests/glsl/buffer_pointer.spv",
819+
"../tests/glsl/built_in_format.spv",
801820
"../tests/glsl/fn_struct_param.spv",
821+
"../tests/glsl/frag_array_input.spv",
822+
"../tests/glsl/frag_barycentric.spv",
802823
"../tests/glsl/input_attachment.spv",
803824
"../tests/glsl/io_vars_vs.spv",
804825
"../tests/glsl/matrix_major_order_glsl.spv",
805826
"../tests/glsl/non_writable_image.spv",
827+
"../tests/glsl/readonly_writeonly.spv",
806828
"../tests/glsl/runtime_array_of_array_of_struct.spv",
829+
"../tests/glsl/storage_buffer.spv",
807830
"../tests/glsl/texel_buffer.spv",
808831
"../tests/hlsl/append_consume.spv",
809832
"../tests/hlsl/array_of_structured_buffer.spv",
@@ -818,13 +841,21 @@ const std::vector<const char*> all_spirv_paths = {
818841
"../tests/hlsl/pushconstant.spv",
819842
"../tests/hlsl/semantics.spv",
820843
"../tests/hlsl/structuredbuffer.spv",
844+
"../tests/hlsl/user_type.spv",
845+
"../tests/interface/geom_input_builtin_array.spv",
846+
"../tests/interface/vertex_input_builtin_block.spv",
847+
"../tests/interface/vertex_input_builtin_non_block.spv",
821848
"../tests/issues/77/hlsl/array_from_ubo.spv",
822849
"../tests/issues/77/hlsl/array_from_ubo_with_O0.spv",
823850
"../tests/issues/77/hlsl/rocketz.spv",
824851
"../tests/issues/102/function_parameter_access.spv",
825852
"../tests/issues/178/vertex_input_struct.spv",
826853
"../tests/issues/178/vertex_input_struct2.spv",
854+
"../tests/issues/227/null_node.spv",
855+
"../tests/mesh_shader_ext/mesh_shader_ext.task.hlsl.spv",
856+
"../tests/mesh_shader_ext/mesh_shader_ext.mesh.hlsl.spv",
827857
"../tests/multi_entrypoint/multi_entrypoint.spv",
858+
"../tests/push_constants/non_zero_block_offset.spv",
828859
"../tests/raytrace/rayquery_equal.cs.spv",
829860
"../tests/raytrace/rayquery_init_ds.spv",
830861
"../tests/raytrace/rayquery_init_gs.spv",
@@ -846,9 +877,20 @@ const std::vector<const char*> all_spirv_paths = {
846877
"../tests/raytrace/raytracing.nv.library.spv",
847878
"../tests/raytrace/raytracing.nv.miss.spv",
848879
"../tests/raytrace/raytracing.nv.raygen.spv",
880+
"../tests/spec_constants/basic.spv",
881+
"../tests/spec_constants/convert.spv",
882+
"../tests/spec_constants/local_size_id_10.spv",
883+
"../tests/spec_constants/local_size_id_13.spv",
884+
"../tests/spec_constants/ssbo_array.spv",
885+
"../tests/spec_constants/test_32bit.spv",
886+
"../tests/spec_constants/test_64bit.spv",
849887
"../tests/spirv15/VertexShader.spv",
850-
"../tests/mesh_shader_ext/mesh_shader_ext.task.hlsl.spv",
851-
"../tests/mesh_shader_ext/mesh_shader_ext.mesh.hlsl.spv",
888+
"../tests/user_type/byte_address_buffer_0.spv",
889+
"../tests/user_type/byte_address_buffer_1.spv",
890+
"../tests/user_type/byte_address_buffer_2.spv",
891+
"../tests/user_type/byte_address_buffer_3.spv",
892+
"../tests/user_type/rw_byte_address_buffer.spv",
893+
"../tests/variable_access/copy_memory.spv",
852894
// clang-format on
853895
};
854896
} // namespace

tests/user_type/byte_address_buffer_0.spv.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ all_descriptor_bindings:
101101
accessed: 1
102102
uav_counter_id: 4294967295
103103
uav_counter_binding:
104-
ByteAddressBuffer offsets: [13, 5, 11, 4]
104+
ByteAddressBuffer offsets: [4, 5, 11, 13]
105105
type_description: *td1
106106
word_offset: { binding: 129, set: 125 }
107107
user_type: ByteAddressBuffer

tests/user_type/byte_address_buffer_1.spv.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ all_descriptor_bindings:
268268
accessed: 1
269269
uav_counter_id: 4294967295
270270
uav_counter_binding:
271-
ByteAddressBuffer offsets: [2, 1]
271+
ByteAddressBuffer offsets: [1, 2]
272272
type_description: *td5
273273
word_offset: { binding: 112, set: 108 }
274274
user_type: ByteAddressBuffer

tests/user_type/rw_byte_address_buffer.spv.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ all_descriptor_bindings:
101101
accessed: 1
102102
uav_counter_id: 4294967295
103103
uav_counter_binding:
104-
ByteAddressBuffer offsets: [13, 5, 11, 4]
104+
ByteAddressBuffer offsets: [4, 5, 11, 13]
105105
type_description: *td1
106106
word_offset: { binding: 130, set: 126 }
107107
user_type: RWByteAddressBuffer

0 commit comments

Comments
 (0)