Skip to content

Commit a9a6330

Browse files
addressing pr comments
1 parent 1aebbf9 commit a9a6330

File tree

3 files changed

+5
-22
lines changed

3 files changed

+5
-22
lines changed

clang/lib/Sema/HLSLExternalSemaSource.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -714,11 +714,10 @@ void HLSLExternalSemaSource::defineHLSLTypesWithForwardDeclarations() {
714714
Decl = BuiltinTypeDeclBuilder(*SemaPtr, HLSLNamespace, "ByteAddressBuffer")
715715
.Record;
716716
onCompletion(Decl, [this](CXXRecordDecl *Decl) {
717-
setupBufferType(Decl, *SemaPtr, ResourceClass::UAV, ResourceKind::RawBuffer,
718-
/*IsROV=*/true,
717+
setupBufferType(Decl, *SemaPtr, ResourceClass::SRV, ResourceKind::RawBuffer,
718+
/*IsROV=*/false,
719719
/*RawBuffer=*/true)
720-
.addArraySubscriptOperators()
721-
.completeDefinition();
720+
.completeDefinition();
722721
});
723722
}
724723

clang/test/AST/HLSL/ByteAddressBuffer-AST.hlsl

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,7 @@ ByteAddressBuffer Buffer;
1919

2020
// CHECK: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final
2121
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit h '__hlsl_resource_t
22-
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
22+
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
2323
// CHECK-SAME{LITERAL}: [[hlsl::raw_buffer]]
2424
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(char8_t)]]
2525
// CHECK-NEXT: HLSLResourceAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit RawBuffer
26-
27-
// CHECK: CXXMethodDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> operator[] 'char8_t &const (unsigned int) const'
28-
// CHECK-NEXT: ParmVarDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> Idx 'unsigned int'
29-
// CHECK-NEXT: CompoundStmt 0x{{[0-9A-Fa-f]+}} <<invalid sloc>>
30-
// CHECK-NEXT: ReturnStmt 0x{{[0-9A-Fa-f]+}} <<invalid sloc>>
31-
// CHECK-NEXT: MemberExpr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> 'char8_t' lvalue .e 0x{{[0-9A-Fa-f]+}}
32-
// CHECK-NEXT: CXXThisExpr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> 'const hlsl::ByteAddressBuffer' lvalue implicit this
33-
// CHECK-NEXT: AlwaysInlineAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit always_inline
34-
35-
// CHECK-NEXT: CXXMethodDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> operator[] 'char8_t &(unsigned int)'
36-
// CHECK-NEXT: ParmVarDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> Idx 'unsigned int'
37-
// CHECK-NEXT: CompoundStmt 0x{{[0-9A-Fa-f]+}} <<invalid sloc>>
38-
// CHECK-NEXT: ReturnStmt 0x{{[0-9A-Fa-f]+}} <<invalid sloc>>
39-
// CHECK-NEXT: MemberExpr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> 'char8_t' lvalue .e 0x{{[0-9A-Fa-f]+}}
40-
// CHECK-NEXT: CXXThisExpr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> 'hlsl::ByteAddressBuffer' lvalue implicit this
41-
// CHECK-NEXT: AlwaysInlineAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit always_inline

clang/test/CodeGenHLSL/builtins/ByteAddressBuffer-contructor.hlsl renamed to clang/test/CodeGenHLSL/builtins/ByteAddressBuffers-constructors.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// NOTE: SPIRV codegen for resource types is not yet implemented
55

6-
ByteAddressBuffer Buffer: register(u0, space0);
6+
ByteAddressBuffer Buffer: register(t0);
77

88
// CHECK: class.hlsl::ByteAddressBuffer" = type <{ target("dx.RawBuffer", i8, 1, 1), i8, [3 x i8] }>
99

0 commit comments

Comments
 (0)