fmt + const removal

Author: EmilioLaiso

include/API/FormatConversion.h

@@ -1,4 +1,4 @@
-//===- FormatConversion.h - Bridge between DataFormat and Format -----------===//
+//===- FormatConversion.h - Refactoring helpers ---------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

lib/API/DX/Device.cpp

@@ -423,11 +423,11 @@ class DXDevice : public offloadtest::Device {
       InitialState = D3D12_RESOURCE_STATE_COPY_DEST;
 
     ComPtr<ID3D12Resource> DeviceBuffer;
-    if (auto Err = HR::toError(Device->CreateCommittedResource(
-                                   &HeapProps, D3D12_HEAP_FLAG_NONE,
-                                   &BufferDesc, InitialState, nullptr,
-                                   IID_PPV_ARGS(&DeviceBuffer)),
-                               "Failed to create buffer."))
+    if (auto Err =
+            HR::toError(Device->CreateCommittedResource(
+                            &HeapProps, D3D12_HEAP_FLAG_NONE, &BufferDesc,
+                            InitialState, nullptr, IID_PPV_ARGS(&DeviceBuffer)),
+                        "Failed to create buffer."))
       return Err;
 
     return std::make_shared<DXBuffer>(DeviceBuffer, Name, Desc, SizeInBytes);

lib/API/MTL/MTLDevice.cpp

@@ -371,7 +371,7 @@ class MTLDevice : public offloadtest::Device {
     if (TableSize > 0) {
       IS.ArgBuffer =
           Device->newBuffer(TableSize, MTL::ResourceStorageModeManaged);
-      const uint32_t HeapIndex = 0;
+      uint32_t HeapIndex = 0;
       for (auto &D : P.Sets) {
         for (auto &R : D.Resources) {
           if (auto Err = createDescriptor(R, IS, HeapIndex++))
@@ -506,8 +506,8 @@ class MTLDevice : public offloadtest::Device {
     MTL::RenderPassDescriptor *Desc =
         MTL::RenderPassDescriptor::alloc()->init();
 
-    const uint64_t Width = P.Bindings.RTargetBufferPtr->OutputProps.Width;
-    const uint64_t Height = P.Bindings.RTargetBufferPtr->OutputProps.Height;
+    const uint64_t Width = IS.FrameBufferTexture->Desc.Width;
+    const uint64_t Height = IS.FrameBufferTexture->Desc.Height;
 
     // Color attachment.
     auto *CADesc = MTL::RenderPassColorAttachmentDescriptor::alloc()->init();
@@ -576,7 +576,7 @@ class MTLDevice : public offloadtest::Device {
 
     // Blit the render target into the readback buffer for CPU access.
     MTL::BlitCommandEncoder *Blit = IS.CmdBuffer->blitCommandEncoder();
-    const size_t ElemSize = RTarget->getElementSize();
+    const size_t ElemSize = getFormatSize(IS.FrameBufferTexture->Desc.Format);
     const size_t RowBytes = Width * ElemSize;
     Blit->copyFromTexture(IS.FrameBufferTexture->Tex, 0, 0,
                           MTL::Origin(0, 0, 0), MTL::Size(Width, Height, 1),
@@ -599,8 +599,8 @@ class MTLDevice : public offloadtest::Device {
   }
 
   llvm::Error copyBack(Pipeline &P, InvocationState &IS) {
-    const uint32_t TextureIndex = 0;
-    const uint32_t BufferIndex = 0;
+    uint32_t TextureIndex = 0;
+    uint32_t BufferIndex = 0;
     for (auto &D : P.Sets) {
       for (auto &R : D.Resources) {
         assert(R.BufferPtr->ArraySize == 1 &&