Skip to content
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

[spirv] do not round size of last row vector for dx layout #2645

Closed
wants to merge 1 commit into from
Closed

[spirv] do not round size of last row vector for dx layout #2645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions tools/clang/lib/SPIRV/AlignmentSizeCalculator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,20 @@ std::pair<uint32_t, uint32_t> AlignmentSizeCalculator::getAlignmentAndSize(
return {alignment, rowCount * colCount * size};
}

if (rowMajor && rule == SpirvLayoutRule::FxcCTBuffer) {
// Same as GLSL rules with special sizing scheme:
// The size of the last row vector is not rounded up.
// For example, a float should be at offset 44 following a float3x3.
// The SPIR-V validator accepts this sizing scheme but *only*
// for row-major layout.
const uint32_t lastVecSize = alignment * vecStorageSize;
alignment *= (vecStorageSize == 3 ? 4 : vecStorageSize);
alignment = roundToPow2(alignment, kStd140Vec4Alignment);
*stride = alignment;
size = (colCount - 1) * alignment + lastVecSize;
return {alignment, size};
}

alignment *= (vecStorageSize == 3 ? 4 : vecStorageSize);
if (rule == SpirvLayoutRule::GLSLStd140 ||
rule == SpirvLayoutRule::RelaxedGLSLStd140 ||
Expand Down
16 changes: 16 additions & 0 deletions tools/clang/test/CodeGenSPIRV/vk.layout.cbuffer.fxc.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ struct S {
// float3 CB_vector5; // Offset: 2976 Size: 12 [unused]
// int CB_scalarArray3[3]; // Offset: 2992 Size: 36 [unused]
// float3 CB_vector6; // Offset: 3028 Size: 12 [unused]
// float3x3 CB_matrix5; // Offset: 3040 Size: 44 [unused]
// float CB_scalar3; // Offset: 3084 Size: 4 [unused]
//
// }

Expand Down Expand Up @@ -197,6 +199,10 @@ struct S {
// CHECK: OpMemberDecorate %type_MyCBuffer 21 Offset 2976
// CHECK: OpMemberDecorate %type_MyCBuffer 22 Offset 2992
// CHECK: OpMemberDecorate %type_MyCBuffer 23 Offset 3028
// CHECK: OpMemberDecorate %type_MyCBuffer 24 Offset 3040
// CHECK: OpMemberDecorate %type_MyCBuffer 24 MatrixStride 16
// CHECK: OpMemberDecorate %type_MyCBuffer 24 RowMajor
// CHECK: OpMemberDecorate %type_MyCBuffer 25 Offset 3084

cbuffer MyCBuffer
{
Expand Down Expand Up @@ -224,6 +230,8 @@ cbuffer MyCBuffer
float3 CB_vector5;
int CB_scalarArray3[3];
float3 CB_vector6;
float3x3 CB_matrix5;
float CB_scalar3;
};

// fxc layout:
Expand Down Expand Up @@ -277,6 +285,8 @@ cbuffer MyCBuffer
// double3 TB_vector4; // Offset: 2816 Size: 24 [unused]
// double3 TB_vectorArray4[4]; // Offset: 2848 Size: 120 [unused]
// double TB_scalar2; // Offset: 2968 Size: 8 [unused]
// float3x3 TB_matrix5; // Offset: 2976 Size: 44 [unused]
// float TB_scalar3; // Offset: 3020 Size: 4 [unused]
//
// }

Expand Down Expand Up @@ -317,6 +327,10 @@ cbuffer MyCBuffer
// CHECK: OpMemberDecorate %type_MyTBuffer 18 Offset 2816
// CHECK: OpMemberDecorate %type_MyTBuffer 19 Offset 2848
// CHECK: OpMemberDecorate %type_MyTBuffer 20 Offset 2968
// CHECK: OpMemberDecorate %type_MyTBuffer 21 Offset 2976
// CHECK: OpMemberDecorate %type_MyTBuffer 21 MatrixStride 16
// CHECK: OpMemberDecorate %type_MyTBuffer 21 RowMajor
// CHECK: OpMemberDecorate %type_MyTBuffer 22 Offset 3020

tbuffer MyTBuffer
{
Expand All @@ -341,6 +355,8 @@ tbuffer MyTBuffer
double3 TB_vector4;
double3 TB_vectorArray4[4];
double TB_scalar2;
float3x3 TB_matrix5;
float TB_scalar3;
};

ConstantBuffer<S> MyConstantBuffer;
Expand Down