Author: Xiang Li Date: 2022-10-11T09:41:14-07:00 New Revision: b267ac49e764c65322cf772647ff26d6732e5134
URL: https://github.com/llvm/llvm-project/commit/b267ac49e764c65322cf772647ff26d6732e5134 DIFF: https://github.com/llvm/llvm-project/commit/b267ac49e764c65322cf772647ff26d6732e5134.diff LOG: [HLSL] Add Resource kind for HLSLResourceAttr. A new EnumArgument ResourceKind is added for HLSLResourceAttr. This will be use to get resource kind instead of parse it from the type name. Reviewed By: aaron.ballman Differential Revision: https://reviews.llvm.org/D135335 Added: Modified: clang/include/clang/Basic/Attr.td clang/lib/Sema/HLSLExternalSemaSource.cpp clang/test/AST/HLSL/RWBuffer-AST.hlsl Removed: ################################################################################ diff --git a/clang/include/clang/Basic/Attr.td b/clang/include/clang/Basic/Attr.td index fa718b51d8134..fddf097daaafd 100644 --- a/clang/include/clang/Basic/Attr.td +++ b/clang/include/clang/Basic/Attr.td @@ -4037,7 +4037,24 @@ def HLSLResource : InheritableAttr { let Args = [EnumArgument<"ResourceType", "ResourceClass", ["SRV", "UAV", "CBuffer", "Sampler"], ["SRV", "UAV", "CBuffer", "Sampler"] - >]; + >, + EnumArgument<"ResourceShape", "ResourceKind", + ["Texture1D", "Texture2D", "Texture2DMS", + "Texture3D", "TextureCube", "Texture1DArray", + "Texture2DArray", "Texture2DMSArray", + "TextureCubeArray", "TypedBuffer", "RawBuffer", + "StructuredBuffer", "CBufferKind", "SamplerKind", + "TBuffer", "RTAccelerationStructure", "FeedbackTexture2D", + "FeedbackTexture2DArray"], + ["Texture1D", "Texture2D", "Texture2DMS", + "Texture3D", "TextureCube", "Texture1DArray", + "Texture2DArray", "Texture2DMSArray", + "TextureCubeArray", "TypedBuffer", "RawBuffer", + "StructuredBuffer", "CBufferKind", "SamplerKind", + "TBuffer", "RTAccelerationStructure", "FeedbackTexture2D", + "FeedbackTexture2DArray"] + > + ]; let Documentation = [InternalOnly]; } diff --git a/clang/lib/Sema/HLSLExternalSemaSource.cpp b/clang/lib/Sema/HLSLExternalSemaSource.cpp index 681154d52cb33..3794a989be11a 100644 --- a/clang/lib/Sema/HLSLExternalSemaSource.cpp +++ b/clang/lib/Sema/HLSLExternalSemaSource.cpp @@ -116,11 +116,12 @@ struct BuiltinTypeDeclBuilder { } BuiltinTypeDeclBuilder & - annotateResourceClass(HLSLResourceAttr::ResourceClass RC) { + annotateResourceClass(HLSLResourceAttr::ResourceClass RC, + HLSLResourceAttr::ResourceKind RK) { if (Record->isCompleteDefinition()) return *this; Record->addAttr( - HLSLResourceAttr::CreateImplicit(Record->getASTContext(), RC)); + HLSLResourceAttr::CreateImplicit(Record->getASTContext(), RC, RK)); return *this; } @@ -501,6 +502,7 @@ void HLSLExternalSemaSource::completeBufferType(CXXRecordDecl *Record) { .addHandleMember() .addDefaultHandleConstructor(*SemaPtr, ResourceClass::UAV) .addArraySubscriptOperators() - .annotateResourceClass(HLSLResourceAttr::UAV) + .annotateResourceClass(HLSLResourceAttr::UAV, + HLSLResourceAttr::TypedBuffer) .completeDefinition(); } diff --git a/clang/test/AST/HLSL/RWBuffer-AST.hlsl b/clang/test/AST/HLSL/RWBuffer-AST.hlsl index 80f77f97d2ef0..0929462e51831 100644 --- a/clang/test/AST/HLSL/RWBuffer-AST.hlsl +++ b/clang/test/AST/HLSL/RWBuffer-AST.hlsl @@ -38,7 +38,7 @@ RWBuffer<float> Buffer; // CHECK-NEXT: CXXRecordDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit class RWBuffer definition // CHECK: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final -// CHECK-NEXT: HLSLResourceAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit UAV +// CHECK-NEXT: HLSLResourceAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit UAV TypedBuffer // CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit h 'element_type *' // CHECK: CXXMethodDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> operator[] 'element_type &const (unsigned int) const' @@ -66,5 +66,5 @@ RWBuffer<float> Buffer; // CHECK: TemplateArgument type 'float' // CHECK-NEXT: BuiltinType 0x{{[0-9A-Fa-f]+}} 'float' // CHECK-NEXT: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final -// CHECK-NEXT: HLSLResourceAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit UAV +// CHECK-NEXT: HLSLResourceAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit UAV TypedBuffer // CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit referenced h 'float *' _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
