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

Jump to bottom

[Sema] Prevent unwanted conversions related to ResourceDescriptorHeap/SamplerDescriptorHeap #6780

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+136 −5
Open

[Sema] Prevent unwanted conversions related to ResourceDescriptorHeap/SamplerDescriptorHeap #6780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d972168
[Sema] Prevent unwanted conversions related to ResourceDescriptorHeap…
mateeeeeee Jul 13, 2024
1cb2bfe
clang format
mateeeeeee Jul 13, 2024
7df51c7
remove empty line
mateeeeeee Jul 13, 2024
75180ca
add missing tests
mateeeeeee Jul 13, 2024
f6dcdde
correct recently added tests
mateeeeeee Jul 13, 2024
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
1 change: 1 addition & 0 deletions tools/clang/include/clang/AST/HlslTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,7 @@ bool IsHLSLNodeOutputType(clang::QualType type);

DXIL::NodeIOKind GetNodeIOType(clang::QualType type);

bool IsHLSLSamplerType(clang::QualType type);
bool IsHLSLStructuredBufferType(clang::QualType type);
bool IsHLSLNumericOrAggregateOfNumericType(clang::QualType type);
bool IsHLSLNumericUserDefinedType(clang::QualType type);
Expand Down
10 changes: 10 additions & 0 deletions tools/clang/lib/AST/HlslTypes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,16 @@ bool IsHLSLNodeOutputType(clang::QualType type) {
static_cast<uint32_t>(DXIL::NodeIOFlags::Output);
}

bool IsHLSLSamplerType(clang::QualType type) {
if (const RecordType *RT = type->getAs<RecordType>()) {
StringRef name = RT->getDecl()->getName();

if (name == "SamplerState" || name == "SamplerComparisonState")
return true;
}
return false;
}

bool IsHLSLStructuredBufferType(clang::QualType type) {
if (const RecordType *RT = type->getAs<RecordType>()) {
StringRef name = RT->getDecl()->getName();
Expand Down
15 changes: 10 additions & 5 deletions tools/clang/lib/Sema/SemaHLSL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9555,11 +9555,16 @@ bool HLSLExternalSource::CanConvert(SourceLocation loc, Expr *sourceExpr,
goto lSuccess;
}

// Cast from Resource to Object types.
if (SourceInfo.EltKind == AR_OBJECT_HEAP_RESOURCE ||
SourceInfo.EltKind == AR_OBJECT_HEAP_SAMPLER) {
// TODO: skip things like PointStream.
if (TargetInfo.ShapeKind == AR_TOBJ_OBJECT) {
if (SourceInfo.EltKind == AR_OBJECT_HEAP_SAMPLER) {
if (TargetInfo.ShapeKind == AR_TOBJ_OBJECT &&
hlsl::IsHLSLSamplerType(target)) {
Second = ICK_Flat_Conversion;
goto lSuccess;
}
}
if (SourceInfo.EltKind == AR_OBJECT_HEAP_RESOURCE) {
if (TargetInfo.ShapeKind == AR_TOBJ_OBJECT &&
hlsl::IsHLSLResourceType(target) && !hlsl::IsHLSLSamplerType(target)) {
Second = ICK_Flat_Conversion;
goto lSuccess;
}
Expand Down
115 changes: 115 additions & 0 deletions tools/clang/test/SemaHLSL/heap-assignments.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
// RUN: %dxc -Tcs_6_6 -verify %s

struct MyStruct
{
float f;
};

void TestSamplerDescriptorHeap()
{
SamplerState s1 = SamplerDescriptorHeap[0];
SamplerComparisonState s2 = SamplerDescriptorHeap[0];

Texture1D<float> t1 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'Texture1D<float>' with an rvalue of type 'const .Sampler'}}
RWTexture1D<float> t2 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RWTexture1D<float>' with an rvalue of type 'const .Sampler'}}
Texture2D<float> t3 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'Texture2D<float>' with an rvalue of type 'const .Sampler'}}
RWTexture2D<float> t4 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RWTexture2D<float>' with an rvalue of type 'const .Sampler'}}
Texture3D<float> t5 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'Texture3D<float>' with an rvalue of type 'const .Sampler'}}
RWTexture3D<float> t6 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RWTexture3D<float>' with an rvalue of type 'const .Sampler'}}

Texture2DMS<float> t7 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'Texture2DMS<float>' with an rvalue of type 'const .Sampler'}}
RWTexture2DMS<float> t8 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RWTexture2DMS<float>' with an rvalue of type 'const .Sampler'}}
TextureCube<float> t9 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'TextureCube<float>' with an rvalue of type 'const .Sampler'}}

Texture1DArray<float> t10 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'Texture1DArray<float>' with an rvalue of type 'const .Sampler'}}
RWTexture1DArray<float> t11 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RWTexture1DArray<float>' with an rvalue of type 'const .Sampler'}}
Texture2DArray<float> t12 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'Texture2DArray<float>' with an rvalue of type 'const .Sampler'}}
RWTexture2DArray<float> t13 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RWTexture2DArray<float>' with an rvalue of type 'const .Sampler'}}
Texture2DMSArray<float> t14 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'Texture2DMSArray<float>' with an rvalue of type 'const .Sampler'}}
RWTexture2DMSArray<float> t15 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RWTexture2DMSArray<float>' with an rvalue of type 'const .Sampler'}}
TextureCubeArray<float> t16 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'TextureCubeArray<float>' with an rvalue of type 'const .Sampler'}}

FeedbackTexture2D<SAMPLER_FEEDBACK_MIN_MIP> t17 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'FeedbackTexture2D<SAMPLER_FEEDBACK_MIN_MIP>' with an rvalue of type 'const .Sampler'}}
FeedbackTexture2DArray<SAMPLER_FEEDBACK_MIN_MIP> t18 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'FeedbackTexture2DArray<SAMPLER_FEEDBACK_MIN_MIP>' with an rvalue of type 'const .Sampler'}}

RasterizerOrderedTexture1D<float> t19 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RasterizerOrderedTexture1D<float>' with an rvalue of type 'const .Sampler'}}
RasterizerOrderedTexture2D<float> t20 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RasterizerOrderedTexture2D<float>' with an rvalue of type 'const .Sampler'}}
RasterizerOrderedTexture3D<float> t21 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RasterizerOrderedTexture3D<float>' with an rvalue of type 'const .Sampler'}}
RasterizerOrderedTexture1DArray<float> t22 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RasterizerOrderedTexture1DArray<float>' with an rvalue of type 'const .Sampler'}}
RasterizerOrderedTexture2DArray<float> t23 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RasterizerOrderedTexture2DArray<float>' with an rvalue of type 'const .Sampler'}}

ByteAddressBuffer b1 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'ByteAddressBuffer' with an rvalue of type 'const .Sampler'}}
RWByteAddressBuffer b2 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RWByteAddressBuffer' with an rvalue of type 'const .Sampler'}}
StructuredBuffer<float> b3 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'StructuredBuffer<float>' with an rvalue of type 'const .Sampler'}}
RWStructuredBuffer<float> b4 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RWStructuredBuffer<float>' with an rvalue of type 'const .Sampler'}}
AppendStructuredBuffer<float> b5 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'AppendStructuredBuffer<float>' with an rvalue of type 'const .Sampler'}}
ConsumeStructuredBuffer<float> b6 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'ConsumeStructuredBuffer<float>' with an rvalue of type 'const .Sampler'}}
Buffer<float> b7 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'Buffer<float>' with an rvalue of type 'const .Sampler'}}
RWBuffer<float> b8 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RWBuffer<float>' with an rvalue of type 'const .Sampler'}}
RasterizerOrderedBuffer<float> b9 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RasterizerOrderedBuffer<float>' with an rvalue of type 'const .Sampler'}}
RasterizerOrderedByteAddressBuffer b10 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RasterizerOrderedByteAddressBuffer' with an rvalue of type 'const .Sampler'}}
RasterizerOrderedStructuredBuffer<float> b11 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RasterizerOrderedStructuredBuffer<float>' with an rvalue of type 'const .Sampler'}}

ConstantBuffer<MyStruct> cb0 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'ConstantBuffer<MyStruct>' with an rvalue of type 'const .Sampler'}}
TextureBuffer<MyStruct> tb0 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'TextureBuffer<MyStruct>' with an rvalue of type 'const .Sampler'}}

RaytracingAccelerationStructure as0 = SamplerDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'RaytracingAccelerationStructure' with an rvalue of type 'const .Sampler'}}
}

void TestResourceDescriptorHeap()
{
SamplerState s1 = ResourceDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'SamplerState' with an rvalue of type 'const .Resource'}}
SamplerComparisonState s2 = ResourceDescriptorHeap[0]; // expected-error{{cannot initialize a variable of type 'SamplerComparisonState' with an rvalue of type 'const .Resource'}}

Texture1D<float> t1 = ResourceDescriptorHeap[0];
RWTexture1D<float> t2 = ResourceDescriptorHeap[0];
Texture2D<float> t3 = ResourceDescriptorHeap[0];
RWTexture2D<float> t4 = ResourceDescriptorHeap[0];
Texture3D<float> t5 = ResourceDescriptorHeap[0];
RWTexture3D<float> t6 = ResourceDescriptorHeap[0];

Texture2DMS<float> t7 = ResourceDescriptorHeap[0];
RWTexture2DMS<float> t8 = ResourceDescriptorHeap[0];
TextureCube<float> t9 = ResourceDescriptorHeap[0];

Texture1DArray<float> t10 = ResourceDescriptorHeap[0];
RWTexture1DArray<float> t11 = ResourceDescriptorHeap[0];
Texture2DArray<float> t12 = ResourceDescriptorHeap[0];
RWTexture2DArray<float> t13 = ResourceDescriptorHeap[0];
Texture2DMSArray<float> t14 = ResourceDescriptorHeap[0];
RWTexture2DMSArray<float> t15 = ResourceDescriptorHeap[0];
TextureCubeArray<float> t16 = ResourceDescriptorHeap[0];

FeedbackTexture2D<SAMPLER_FEEDBACK_MIN_MIP> t17 = ResourceDescriptorHeap[0];
FeedbackTexture2DArray<SAMPLER_FEEDBACK_MIN_MIP> t18 = ResourceDescriptorHeap[0];

RasterizerOrderedTexture1D<float> t19 = ResourceDescriptorHeap[0];
RasterizerOrderedTexture2D<float> t20 = ResourceDescriptorHeap[0];
RasterizerOrderedTexture3D<float> t21 = ResourceDescriptorHeap[0];
RasterizerOrderedTexture1DArray<float> t22 = ResourceDescriptorHeap[0];
RasterizerOrderedTexture2DArray<float> t23 = ResourceDescriptorHeap[0];

ByteAddressBuffer b1 = ResourceDescriptorHeap[0];
RWByteAddressBuffer b2 = ResourceDescriptorHeap[0];
StructuredBuffer<float> b3 = ResourceDescriptorHeap[0];
RWStructuredBuffer<float> b4 = ResourceDescriptorHeap[0];
AppendStructuredBuffer<float> b5 = ResourceDescriptorHeap[0];
ConsumeStructuredBuffer<float> b6 = ResourceDescriptorHeap[0];
Buffer<float> b7 = ResourceDescriptorHeap[0];
RWBuffer<float> b8 = ResourceDescriptorHeap[0];
RasterizerOrderedBuffer<float> b9 = ResourceDescriptorHeap[0];
RasterizerOrderedByteAddressBuffer b10 = ResourceDescriptorHeap[0];
RasterizerOrderedStructuredBuffer<float> b11 = ResourceDescriptorHeap[0];

ConstantBuffer<MyStruct> cb0 = ResourceDescriptorHeap[0];
TextureBuffer<MyStruct> tb0 = ResourceDescriptorHeap[0];

RaytracingAccelerationStructure as0 = ResourceDescriptorHeap[0];
}

[numthreads(1, 1, 1)]
void main()
{
TestSamplerDescriptorHeap();
TestResourceDescriptorHeap();
}
Loading