Moving CBufferRowSizeInBytes constant to HLSLResource.h

Author: hekota

clang/lib/CodeGen/CGHLSLRuntime.cpp

@@ -40,6 +40,8 @@ using namespace CodeGen;
 using namespace clang::hlsl;
 using namespace llvm;
 
+using llvm::hlsl::CBufferRowSizeInBytes;
+
 static void createResourceInitFn(CodeGenModule &CGM, llvm::GlobalVariable *GV,
                                  unsigned Slot, unsigned Space);
 
@@ -208,7 +210,7 @@ static void fillPackoffsetLayout(const HLSLBufferDecl *BufDecl,
           if (RBA->getRegisterType() ==
               HLSLResourceBindingAttr::RegisterType::C) {
             // size of constant buffer row is 16 bytes
-            Offset = RBA->getSlotNumber() * CGHLSLRuntime::BufferRowSizeInBytes;
+            Offset = RBA->getSlotNumber() * CBufferRowSizeInBytes;
           }
         }
       }

clang/lib/CodeGen/CGHLSLRuntime.h

@@ -134,8 +134,6 @@ class CGHLSLRuntime {
     BufferResBinding(HLSLResourceBindingAttr *Attr);
   };
 
-  static const unsigned BufferRowSizeInBytes = 16U;
-
 protected:
   CodeGenModule &CGM;
 

clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp

@@ -19,6 +19,7 @@
 
 using namespace clang;
 using namespace clang::CodeGen;
+using llvm::hlsl::CBufferRowSizeInBytes;
 
 namespace {
 
@@ -197,7 +198,7 @@ bool HLSLBufferLayoutBuilder::layoutField(const FieldDecl *FD,
   unsigned ArrayStride = 0;
 
   unsigned NextRowOffset =
-      llvm::alignTo(EndOffset, CGHLSLRuntime::BufferRowSizeInBytes);
+      llvm::alignTo(EndOffset, CBufferRowSizeInBytes);
 
   llvm::Type *ElemLayoutTy = nullptr;
   QualType FieldTy = FD->getType();
@@ -227,7 +228,7 @@ bool HLSLBufferLayoutBuilder::layoutField(const FieldDecl *FD,
           getScalarOrVectorSizeInBytes(CGM.getTypes().ConvertTypeForMem(Ty));
       ElemLayoutTy = CGM.getTypes().ConvertTypeForMem(FieldTy);
     }
-    ArrayStride = llvm::alignTo(ElemSize, CGHLSLRuntime::BufferRowSizeInBytes);
+    ArrayStride = llvm::alignTo(ElemSize, CBufferRowSizeInBytes);
     ElemOffset = (Packoffset != -1) ? Packoffset : NextRowOffset;
 
   } else if (FieldTy->isStructureType()) {

llvm/include/llvm/Frontend/HLSL/HLSLResource.h

@@ -27,6 +27,8 @@ using dxil::ResourceClass;
 using dxil::ElementType;
 using dxil::ResourceKind;
 
+const unsigned CBufferRowSizeInBytes = 16U;
+
 class FrontendResource {
   MDNode *Entry;