Turn ShaderTable::Init into a ctor with initializer list

Author: simoll

tools/clang/unittests/HLSLExec/DXRUtil.h

@@ -42,18 +42,16 @@ struct Instance {
 
 class ShaderTable {
 public:
-  void Init(ID3D12Device *Device, int RaygenCount, int MissCount,
-            int HitGroupCount, int RayTypeCount, int RootTableDwords) {
-    RayTypeCount = RayTypeCount;
-    RaygenCount = RaygenCount;
-    MissCount = MissCount * RayTypeCount;
-    HitGroupCount = HitGroupCount * RayTypeCount;
-    RootTableSizeInBytes = RootTableDwords * 4;
-    ShaderRecordSizeInBytes =
-        ROUND_UP(RootTableSizeInBytes + SHADER_ID_SIZE_IN_BYTES,
-                 D3D12_RAYTRACING_SHADER_RECORD_BYTE_ALIGNMENT);
-    MissStartIdx = RaygenCount;
-    HitGroupStartIdx = MissStartIdx + MissCount;
+  ShaderTable(ID3D12Device *Device, int RaygenCount, int MissCount,
+              int HitGroupCount, int RayTypeCount, int RootTableDwords)
+      : RayTypeCount(RayTypeCount), RaygenCount(RaygenCount),
+        MissCount(MissCount * RayTypeCount),
+        HitGroupCount(HitGroupCount * RayTypeCount),
+        RootTableSizeInBytes(RootTableDwords * 4),
+        ShaderRecordSizeInBytes(
+            ROUND_UP(RootTableSizeInBytes + SHADER_ID_SIZE_IN_BYTES,
+                     D3D12_RAYTRACING_SHADER_RECORD_BYTE_ALIGNMENT)),
+        MissStartIdx(RaygenCount), HitGroupStartIdx(MissStartIdx + MissCount) {
 
     const int TotalSizeInBytes =
         (RaygenCount + MissCount + HitGroupCount) * ShaderRecordSizeInBytes;

tools/clang/unittests/HLSLExec/ExecutionTest.cpp

@@ -2499,13 +2499,13 @@ CComPtr<ID3D12Resource> ExecutionTest::RunDXRTest(
   VERIFY_SUCCEEDED(StateObject->QueryInterface(&StateObjectProperties));
 
   // Create SBT
-  ShaderTable ShaderTable;
-  ShaderTable.Init(Device,
-                   1,                                        // raygen count
-                   1,                                        // miss count
-                   UseMesh && UseProceduralGeometry ? 2 : 1, // hit group count
-                   1,                                        // ray type count
-                   4 // dwords per root table
+  ShaderTable ShaderTable(
+      Device,
+      1,                                        // raygen count
+      1,                                        // miss count
+      UseMesh && UseProceduralGeometry ? 2 : 1, // hit group count
+      1,                                        // ray type count
+      4                                         // dwords per root table
   );
 
   int LocalRootConsts[4] = {12, 34, 56, 78};