Use inbounds access chain for SRV/UAV BDA as well.

HansKristian-Work · May 31, 2022 · e08570f · e08570f
1 parent d5f8f74
commit e08570f
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 29 deletions.
diff --git a/opcodes/dxil/dxil_buffer.cpp b/opcodes/dxil/dxil_buffer.cpp
@@ -468,7 +468,8 @@ static bool emit_physical_buffer_load_instruction(Converter::Impl &impl, const l
 	ptr_bitcast_op->add_id(u64_ptr_id);
 	impl.add(ptr_bitcast_op);
 
-	auto *chain_op = impl.allocate(spv::OpAccessChain, builder.makePointer(spv::StorageClassPhysicalStorageBuffer, physical_type_id));
+	auto *chain_op = impl.allocate(spv::OpInBoundsAccessChain,
+								   builder.makePointer(spv::StorageClassPhysicalStorageBuffer, physical_type_id));
 	chain_op->add_id(ptr_bitcast_op->id);
 	chain_op->add_id(builder.makeUintConstant(0));
 	if (array_id)
@@ -875,7 +876,8 @@ static bool emit_physical_buffer_store_instruction(Converter::Impl &impl, const
 	ptr_bitcast_op->add_id(u64_ptr_id);
 	impl.add(ptr_bitcast_op);
 
-	auto *chain_op = impl.allocate(spv::OpAccessChain, builder.makePointer(spv::StorageClassPhysicalStorageBuffer, vec_type_id));
+	auto *chain_op = impl.allocate(spv::OpInBoundsAccessChain,
+								   builder.makePointer(spv::StorageClassPhysicalStorageBuffer, vec_type_id));
 	chain_op->add_id(ptr_bitcast_op->id);
 	chain_op->add_id(builder.makeUintConstant(0));
 	if (array_id)

diff --git a/reference/shaders/resources/root-bda.root-descriptor.comp b/reference/shaders/resources/root-bda.root-descriptor.comp
diff --git a/reference/shaders/resources/root-bda.root-descriptor.sm60.comp b/reference/shaders/resources/root-bda.root-descriptor.sm60.comp
diff --git a/reference/shaders/resources/root-constant-with-bda.root-descriptor.root-constant.comp b/reference/shaders/resources/root-constant-with-bda.root-descriptor.root-constant.comp
diff --git a/reference/shaders/resources/rt-resources.bindless.local-root-signature.rmiss b/reference/shaders/resources/rt-resources.bindless.local-root-signature.rmiss
diff --git a/reference/shaders/resources/ssbo-minprecision.sm60.ssbo.native-fp16.root-descriptor.frag b/reference/shaders/resources/ssbo-minprecision.sm60.ssbo.native-fp16.root-descriptor.frag
diff --git a/reference/shaders/resources/ssbo-minprecision.sm60.ssbo.root-descriptor.frag b/reference/shaders/resources/ssbo-minprecision.sm60.ssbo.root-descriptor.frag