Skip to content

[SPIRV] Fix layout rule for BufferPointer pointee type #7956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
s-perron merged 2 commits into from
Dec 2, 2025
Merged

[SPIRV] Fix layout rule for BufferPointer pointee type #7956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
824dd2a
[SPIRV] Fix layout rule for BufferPointer pointee type
s-perron Nov 28, 2025
c866de0
revert submodule change.
s-perron Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions tools/clang/lib/SPIRV/LowerTypeVisitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,12 +836,10 @@ const SpirvType *LowerTypeVisitor::lowerVkTypeInVkNamespace(
}

QualType realType = hlsl::GetHLSLResourceTemplateParamType(type);
if (rule == SpirvLayoutRule::Void) {
rule = spvOptions.sBufferLayoutRule;
}
visitedTypeStack.push_back(type);

const SpirvType *spirvType = lowerType(realType, rule, llvm::None, srcLoc);
const SpirvType *spirvType =
lowerType(realType, spvOptions.sBufferLayoutRule, llvm::None, srcLoc);
const auto *pointerType = spvContext.getPointerType(
spirvType, spv::StorageClass::PhysicalStorageBuffer);
spvContext.registerForwardReference(type, pointerType);
Expand Down
29 changes: 29 additions & 0 deletions tools/clang/test/CodeGenSPIRV/vk.buffer-pointer.different-storage-class.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// RUN: %dxc -spirv -E main -T cs_6_7 %s | FileCheck %s


struct Foo {
int val[4];
};

// CHECK: OpDecorate [[ARRAY_INT_4:%[_0-9A-Za-z]*]] ArrayStride 4
// CHECK: [[TYPE_FOO:%[_0-9A-Za-z]*]] = OpTypeStruct [[ARRAY_INT_4]]
// CHECK: [[PTR_PHYS_BUF_FOO:%[_0-9A-Za-z]*]] = OpTypePointer PhysicalStorageBuffer [[TYPE_FOO]]
// CHECK: [[TYPE_TEST_STRUCT:%[_0-9A-Za-z]*]] = OpTypeStruct [[PTR_PHYS_BUF_FOO]] %_ptr_PhysicalStorageBuffer_int
// CHECK: [[PTR_UNIFORM_TYPE_TEST:%[_0-9A-Za-z]*]] = OpTypePointer Uniform [[TYPE_TEST_STRUCT]]
// CHECK: [[TEST_VAR:%[_0-9A-Za-z]*]] = OpVariable [[PTR_UNIFORM_TYPE_TEST]] Uniform
cbuffer Test {
// The layout of `Foo` for the Buffer pointer should be the layout for
// the storage buffer, even if the pointer is in a cbuffer.
vk::BufferPointer<Foo> fooBuf;
vk::BufferPointer<int> outBuf;
};



[numthreads(256, 1, 1)]
void main(in uint3 threadId : SV_DispatchThreadID) {
// CHECK: [[FOO_BUF_ACCESS_CHAIN:%[_0-9A-Za-z]*]] = OpAccessChain %_ptr_Uniform__ptr_PhysicalStorageBuffer_Foo [[TEST_VAR]] %int_0
// CHECK: [[FOO_BUF_LOAD:%[_0-9A-Za-z]*]] = OpLoad %_ptr_PhysicalStorageBuffer_Foo [[FOO_BUF_ACCESS_CHAIN]]
int val = fooBuf.Get().val[0];
outBuf.Get() = val;
}