GraphicsEngineD3D12: don't use auto where unnecessary

Author: TheMostDiligent

Graphics/GraphicsEngineD3D12/src/BottomLevelASD3D12Impl.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,9 +43,9 @@ BottomLevelASD3D12Impl::BottomLevelASD3D12Impl(IReferenceCounters*      pRefCoun
                                                const BottomLevelASDesc& Desc) :
     TBottomLevelASBase{pRefCounters, pDeviceD3D12, Desc}
 {
-    auto*       pd3d12Device             = pDeviceD3D12->GetD3D12Device5();
-    const auto& RTProps                  = pDeviceD3D12->GetAdapterInfo().RayTracing;
-    UINT64      ResultDataMaxSizeInBytes = 0;
+    ID3D12Device5*              pd3d12Device             = pDeviceD3D12->GetD3D12Device5();
+    const RayTracingProperties& RTProps                  = pDeviceD3D12->GetAdapterInfo().RayTracing;
+    UINT64                      ResultDataMaxSizeInBytes = 0;
 
     if (m_Desc.CompactedSize)
     {
@@ -63,8 +63,8 @@ BottomLevelASD3D12Impl::BottomLevelASD3D12Impl(IReferenceCounters*      pRefCoun
             Uint32 MaxPrimitiveCount = 0;
             for (uint32_t i = 0; i < m_Desc.TriangleCount; ++i)
             {
-                auto& src = m_Desc.pTriangles[i];
-                auto& dst = d3d12Geometries[i];
+                const BLASTriangleDesc&         src = m_Desc.pTriangles[i];
+                D3D12_RAYTRACING_GEOMETRY_DESC& dst = d3d12Geometries[i];
 
                 dst.Type                                 = D3D12_RAYTRACING_GEOMETRY_TYPE_TRIANGLES;
                 dst.Flags                                = D3D12_RAYTRACING_GEOMETRY_FLAG_NONE;
@@ -90,8 +90,8 @@ BottomLevelASD3D12Impl::BottomLevelASD3D12Impl(IReferenceCounters*      pRefCoun
             Uint32 MaxBoxCount = 0;
             for (uint32_t i = 0; i < m_Desc.BoxCount; ++i)
             {
-                auto& src = m_Desc.pBoxes[i];
-                auto& dst = d3d12Geometries[i];
+                const BLASBoundingBoxDesc&      src = m_Desc.pBoxes[i];
+                D3D12_RAYTRACING_GEOMETRY_DESC& dst = d3d12Geometries[i];
 
                 dst.Type                      = D3D12_RAYTRACING_GEOMETRY_TYPE_PROCEDURAL_PRIMITIVE_AABBS;
                 dst.Flags                     = D3D12_RAYTRACING_GEOMETRY_FLAG_NONE;
@@ -149,10 +149,10 @@ BottomLevelASD3D12Impl::BottomLevelASD3D12Impl(IReferenceCounters*      pRefCoun
     ASDesc.Layout             = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
     ASDesc.Flags              = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
 
-    auto hr = pd3d12Device->CreateCommittedResource(&HeapProps, D3D12_HEAP_FLAG_NONE,
-                                                    &ASDesc, D3D12_RESOURCE_STATE_RAYTRACING_ACCELERATION_STRUCTURE, nullptr,
-                                                    __uuidof(m_pd3d12Resource),
-                                                    reinterpret_cast<void**>(static_cast<ID3D12Resource**>(&m_pd3d12Resource)));
+    HRESULT hr = pd3d12Device->CreateCommittedResource(&HeapProps, D3D12_HEAP_FLAG_NONE,
+                                                       &ASDesc, D3D12_RESOURCE_STATE_RAYTRACING_ACCELERATION_STRUCTURE, nullptr,
+                                                       __uuidof(m_pd3d12Resource),
+                                                       reinterpret_cast<void**>(static_cast<ID3D12Resource**>(&m_pd3d12Resource)));
     if (FAILED(hr))
         LOG_ERROR_AND_THROW("Failed to create D3D12 Bottom-level acceleration structure");
 

Graphics/GraphicsEngineD3D12/src/CommandContext.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2023 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -103,7 +103,7 @@ ID3D12GraphicsCommandList* CommandContext::Close(CComPtr<ID3D12CommandAllocator>
     //  EngineProfiling::EndBlock(this);
 
     VERIFY_EXPR(m_pCurrentAllocator != nullptr);
-    auto hr = m_pCommandList->Close();
+    HRESULT hr = m_pCommandList->Close();
     DEV_CHECK_ERR(SUCCEEDED(hr), "Failed to close the command list");
 
     pAllocator = std::move(m_pCurrentAllocator);
@@ -233,7 +233,7 @@ void StateTransitionHelper::DiscardIfAppropriate(const TextureDesc&    TexDesc,
     if ((m_Barrier.Flags & STATE_TRANSITION_FLAG_DISCARD_CONTENT) == 0)
         return;
 
-    const auto d3d12CmdListType = m_CmdCtx.GetCommandListType();
+    const D3D12_COMMAND_LIST_TYPE d3d12CmdListType = m_CmdCtx.GetCommandListType();
 
     bool DiscardAllowed = false;
 
@@ -303,7 +303,7 @@ void StateTransitionHelper::AddD3D12ResourceBarriers(TextureD3D12Impl& Tex, D3D1
     // D3D12_RESOURCE_STATE_COMMON == D3D12_RESOURCE_STATE_PRESENT
     if (d3d12Barrier.Transition.StateBefore != d3d12Barrier.Transition.StateAfter)
     {
-        const auto& TexDesc = Tex.GetDesc();
+        const TextureDesc& TexDesc = Tex.GetDesc();
         VERIFY(m_Barrier.FirstMipLevel < TexDesc.MipLevels, "First mip level is out of range");
         VERIFY(m_Barrier.MipLevelsCount == REMAINING_MIP_LEVELS || m_Barrier.FirstMipLevel + m_Barrier.MipLevelsCount <= TexDesc.MipLevels,
                "Invalid mip level range");
@@ -400,7 +400,7 @@ void StateTransitionHelper::operator()(ResourceType& Resource)
     // Check if required state is already set
     if ((m_OldState & m_Barrier.NewState) != m_Barrier.NewState)
     {
-        auto NewState = m_Barrier.NewState;
+        RESOURCE_STATE NewState = m_Barrier.NewState;
         // If both old state and new state are read-only states, combine the two
         if ((m_OldState & RESOURCE_STATE_GENERIC_READ) == m_OldState &&
             (NewState & RESOURCE_STATE_GENERIC_READ) == NewState)

Graphics/GraphicsEngineD3D12/src/CommandListManager.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -50,7 +50,7 @@ CommandListManager::~CommandListManager()
 void CommandListManager::CreateNewCommandList(ID3D12GraphicsCommandList** List, ID3D12CommandAllocator** Allocator, Uint32& IfaceVersion)
 {
     RequestAllocator(Allocator);
-    auto* pd3d12Device = m_DeviceD3D12Impl.GetD3D12Device();
+    ID3D12Device* pd3d12Device = m_DeviceD3D12Impl.GetD3D12Device();
 
     const IID CmdListIIDs[] =
         {
@@ -91,16 +91,16 @@ void CommandListManager::RequestAllocator(ID3D12CommandAllocator** ppAllocator)
     if (!m_FreeAllocators.empty())
     {
         *ppAllocator = m_FreeAllocators.back().Detach();
-        auto hr      = (*ppAllocator)->Reset();
+        HRESULT hr   = (*ppAllocator)->Reset();
         DEV_CHECK_ERR(SUCCEEDED(hr), "Failed to reset command allocator");
         m_FreeAllocators.pop_back();
     }
 
     // If no allocators were ready to be reused, create a new one
     if ((*ppAllocator) == nullptr)
     {
-        auto* pd3d12Device = m_DeviceD3D12Impl.GetD3D12Device();
-        auto  hr           = pd3d12Device->CreateCommandAllocator(m_CmdListType, __uuidof(*ppAllocator), reinterpret_cast<void**>(ppAllocator));
+        ID3D12Device* pd3d12Device = m_DeviceD3D12Impl.GetD3D12Device();
+        HRESULT       hr           = pd3d12Device->CreateCommandAllocator(m_CmdListType, __uuidof(*ppAllocator), reinterpret_cast<void**>(ppAllocator));
         VERIFY(SUCCEEDED(hr), "Failed to create command allocator");
         wchar_t AllocatorName[32];
         swprintf(AllocatorName, _countof(AllocatorName), L"Cmd list allocator %ld", m_NumAllocators.fetch_add(1));

Graphics/GraphicsEngineD3D12/src/CommandQueueD3D12Impl.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -64,7 +64,7 @@ Uint64 CommandQueueD3D12Impl::Submit(Uint32                    NumCommandLists,
     std::lock_guard<std::mutex> Lock{m_QueueMtx};
 
     // Increment the value before submitting the list
-    auto FenceValue = m_NextFenceValue.fetch_add(1);
+    Uint64 FenceValue = m_NextFenceValue.fetch_add(1);
 
     // Render device submits null command list to signal the fence and
     // discard all resources.
@@ -104,10 +104,10 @@ Uint64 CommandQueueD3D12Impl::WaitForIdle()
 
 Uint64 CommandQueueD3D12Impl::GetCompletedFenceValue()
 {
-    auto CompletedFenceValue = m_d3d12Fence->GetCompletedValue();
+    Uint64 CompletedFenceValue = m_d3d12Fence->GetCompletedValue();
     VERIFY(CompletedFenceValue != UINT64_MAX, "If the device has been removed, the return value will be UINT64_MAX");
 
-    auto CurrValue = m_LastCompletedFenceValue.load();
+    Uint64 CurrValue = m_LastCompletedFenceValue.load();
     while (!m_LastCompletedFenceValue.compare_exchange_weak(CurrValue, std::max(CurrValue, CompletedFenceValue)))
     {
         // If exchange fails, CurrValue will hold the actual value of m_LastCompletedFenceValue
@@ -140,7 +140,7 @@ void CommandQueueD3D12Impl::UpdateTileMappings(ResourceTileMappingsD3D12* pMappi
 
     for (Uint32 i = 0; i < Count; ++i)
     {
-        const auto& Mapping = pMappings[i];
+        const ResourceTileMappingsD3D12& Mapping = pMappings[i];
         if (Mapping.UseNVApi)
         {
 #ifdef DILIGENT_ENABLE_D3D_NVAPI

Graphics/GraphicsEngineD3D12/src/D3D12DynamicHeap.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -57,9 +57,9 @@ D3D12DynamicPage::D3D12DynamicPage(ID3D12Device* pd3d12Device, Uint64 Size)
     DefaultUsage                       = D3D12_RESOURCE_STATE_GENERIC_READ;
     ResourceDesc.Width                 = Size;
 
-    auto hr = pd3d12Device->CreateCommittedResource(&HeapProps, D3D12_HEAP_FLAG_NONE, &ResourceDesc,
-                                                    DefaultUsage, nullptr, __uuidof(m_pd3d12Buffer),
-                                                    reinterpret_cast<void**>(static_cast<ID3D12Resource**>(&m_pd3d12Buffer)));
+    HRESULT hr = pd3d12Device->CreateCommittedResource(&HeapProps, D3D12_HEAP_FLAG_NONE, &ResourceDesc,
+                                                       DefaultUsage, nullptr, __uuidof(m_pd3d12Buffer),
+                                                       reinterpret_cast<void**>(static_cast<ID3D12Resource**>(&m_pd3d12Buffer)));
     if (FAILED(hr))
     {
         LOG_D3D_ERROR(hr, "Failed to create dynamic page");
@@ -85,7 +85,7 @@ D3D12DynamicMemoryManager::D3D12DynamicMemoryManager(IMemoryAllocator&      Allo
     for (Uint32 i = 0; i < NumPagesToReserve; ++i)
     {
         D3D12DynamicPage Page(m_DeviceD3D12Impl.GetD3D12Device(), PageSize);
-        auto             Size = Page.GetSize();
+        Uint64           Size = Page.GetSize();
         m_AvailablePages.emplace(Size, std::move(Page));
     }
 }
@@ -144,12 +144,12 @@ void D3D12DynamicMemoryManager::ReleasePages(std::vector<D3D12DynamicPage>& Page
 #ifdef DILIGENT_DEVELOPMENT
                 --Mgr->m_AllocatedPageCounter;
 #endif
-                auto PageSize = Page.GetSize();
+                Uint64 PageSize = Page.GetSize();
                 Mgr->m_AvailablePages.emplace(PageSize, std::move(Page));
             }
         }
     };
-    for (auto& Page : Pages)
+    for (D3D12DynamicPage& Page : Pages)
     {
         m_DeviceD3D12Impl.SafeReleaseDeviceObject(StalePage{std::move(Page), *this}, QueueMask);
     }
@@ -180,7 +180,7 @@ D3D12DynamicHeap::~D3D12DynamicHeap()
 {
     VERIFY(m_AllocatedPages.empty(), "Allocated pages have not been released which indicates FinishFrame() has not been called");
 
-    auto PeakAllocatedPages = m_PeakAllocatedSize / m_PageSize;
+    Uint64 PeakAllocatedPages = m_PeakAllocatedSize / m_PageSize;
     LOG_INFO_MESSAGE(m_HeapName,
                      " usage stats:\n"
                      "                       Peak used/aligned/allocated size: ",
@@ -199,11 +199,11 @@ D3D12DynamicAllocation D3D12DynamicHeap::Allocate(Uint64 SizeInBytes, Uint64 Ali
 
     if (m_CurrOffset == InvalidOffset || SizeInBytes + (AlignUp(m_CurrOffset, Alignment) - m_CurrOffset) > m_AvailableSize)
     {
-        auto NewPageSize = m_PageSize;
+        Uint64 NewPageSize = m_PageSize;
         while (NewPageSize < SizeInBytes)
             NewPageSize *= 2;
 
-        auto NewPage = m_GlobalDynamicMemMgr.AllocatePage(NewPageSize);
+        D3D12DynamicPage NewPage = m_GlobalDynamicMemMgr.AllocatePage(NewPageSize);
         if (NewPage.IsValid())
         {
             m_CurrOffset    = 0;
@@ -218,8 +218,8 @@ D3D12DynamicAllocation D3D12DynamicHeap::Allocate(Uint64 SizeInBytes, Uint64 Ali
 
     if (m_CurrOffset != InvalidOffset && SizeInBytes + (AlignUp(m_CurrOffset, Alignment) - m_CurrOffset) <= m_AvailableSize)
     {
-        auto AlignedOffset = AlignUp(m_CurrOffset, Alignment);
-        auto AdjustedSize  = SizeInBytes + (AlignedOffset - m_CurrOffset);
+        Uint64 AlignedOffset = AlignUp(m_CurrOffset, Alignment);
+        Uint64 AdjustedSize  = SizeInBytes + (AlignedOffset - m_CurrOffset);
         VERIFY_EXPR(AdjustedSize <= m_AvailableSize);
         m_AvailableSize -= AdjustedSize;
         m_CurrOffset += AdjustedSize;
@@ -230,7 +230,7 @@ D3D12DynamicAllocation D3D12DynamicHeap::Allocate(Uint64 SizeInBytes, Uint64 Ali
         m_CurrAlignedSize += AdjustedSize;
         m_PeakAlignedSize = std::max(m_PeakAlignedSize, m_CurrAlignedSize);
 
-        auto& CurrPage = m_AllocatedPages.back();
+        D3D12DynamicPage& CurrPage = m_AllocatedPages.back();
         // clang-format off
         return D3D12DynamicAllocation
         {

Graphics/GraphicsEngineD3D12/src/D3D12Loader.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +43,7 @@ D3D12SerializeRootSignatureProcType D3D12SerializeRootSignature;
 HMODULE LoadD3D12Dll(const char* DLLPath)
 {
 #if PLATFORM_WIN32
-    auto hModule = LoadLibraryA(DLLPath);
+    HMODULE hModule = LoadLibraryA(DLLPath);
 
     if (hModule == NULL)
     {

Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -113,7 +113,7 @@ D3D12_LOGIC_OP LogicOperationToD3D12LogicOp(LOGIC_OPERATION lo)
     }
     if (lo >= LOGIC_OP_CLEAR && lo < LOGIC_OP_NUM_OPERATIONS)
     {
-        auto d3dlo = D3D12LogicOp[lo];
+        D3D12_LOGIC_OP d3dlo = D3D12LogicOp[lo];
         return d3dlo;
     }
     else
@@ -130,8 +130,8 @@ void BlendStateDesc_To_D3D12_BLEND_DESC(const BlendStateDesc& BSDesc, D3D12_BLEN
 
     for (int i = 0; i < 8; ++i)
     {
-        const auto& SrcRTDesc = BSDesc.RenderTargets[i];
-        auto&       DstRTDesc = d3d12BlendDesc.RenderTarget[i];
+        const RenderTargetBlendDesc&    SrcRTDesc = BSDesc.RenderTargets[i];
+        D3D12_RENDER_TARGET_BLEND_DESC& DstRTDesc = d3d12BlendDesc.RenderTarget[i];
 
         // The following members only present in D3D_RENDER_TARGET_BLEND_DESC
         DstRTDesc.LogicOpEnable = SrcRTDesc.LogicOperationEnable ? TRUE : FALSE;
@@ -432,7 +432,7 @@ D3D12_RESOURCE_STATES ResourceStateFlagsToD3D12ResourceStates(RESOURCE_STATE Sta
     Uint32                                           Bits                = StateFlags;
     while (Bits != 0)
     {
-        auto lsb = PlatformMisc::GetLSB(Bits);
+        Uint32 lsb = PlatformMisc::GetLSB(Bits);
         D3D12ResourceStates |= BitPosToD3D12ResState(lsb);
         Bits &= ~(1 << lsb);
     }
@@ -549,7 +549,7 @@ RESOURCE_STATE D3D12ResourceStatesToResourceStateFlags(D3D12_RESOURCE_STATES Sta
     Uint32 Bits           = StateFlags;
     while (Bits != 0)
     {
-        auto lsb = PlatformMisc::GetLSB(Bits);
+        Uint32 lsb = PlatformMisc::GetLSB(Bits);
         ResourceStates |= BitPosToResState(lsb);
         Bits &= ~(1 << lsb);
     }
@@ -713,7 +713,7 @@ D3D12_RAYTRACING_GEOMETRY_FLAGS GeometryFlagsToD3D12RTGeometryFlags(RAYTRACING_G
     D3D12_RAYTRACING_GEOMETRY_FLAGS Result = D3D12_RAYTRACING_GEOMETRY_FLAG_NONE;
     while (Flags != RAYTRACING_GEOMETRY_FLAG_NONE)
     {
-        auto FlagBit = static_cast<RAYTRACING_GEOMETRY_FLAGS>(1 << PlatformMisc::GetLSB(Uint32{Flags}));
+        RAYTRACING_GEOMETRY_FLAGS FlagBit = static_cast<RAYTRACING_GEOMETRY_FLAGS>(1 << PlatformMisc::GetLSB(Uint32{Flags}));
         switch (FlagBit)
         {
             // clang-format off
@@ -735,7 +735,7 @@ D3D12_RAYTRACING_INSTANCE_FLAGS InstanceFlagsToD3D12RTInstanceFlags(RAYTRACING_I
     D3D12_RAYTRACING_INSTANCE_FLAGS Result = D3D12_RAYTRACING_INSTANCE_FLAG_NONE;
     while (Flags != RAYTRACING_INSTANCE_NONE)
     {
-        auto FlagBit = static_cast<RAYTRACING_INSTANCE_FLAGS>(1 << PlatformMisc::GetLSB(Uint32{Flags}));
+        RAYTRACING_INSTANCE_FLAGS FlagBit = static_cast<RAYTRACING_INSTANCE_FLAGS>(1 << PlatformMisc::GetLSB(Uint32{Flags}));
         switch (FlagBit)
         {
             // clang-format off
@@ -759,7 +759,7 @@ D3D12_RAYTRACING_ACCELERATION_STRUCTURE_BUILD_FLAGS BuildASFlagsToD3D12ASBuildFl
     D3D12_RAYTRACING_ACCELERATION_STRUCTURE_BUILD_FLAGS Result = D3D12_RAYTRACING_ACCELERATION_STRUCTURE_BUILD_FLAG_NONE;
     while (Flags != RAYTRACING_BUILD_AS_NONE)
     {
-        auto FlagBit = static_cast<RAYTRACING_BUILD_AS_FLAGS>(1 << PlatformMisc::GetLSB(Uint32{Flags}));
+        RAYTRACING_BUILD_AS_FLAGS FlagBit = static_cast<RAYTRACING_BUILD_AS_FLAGS>(1 << PlatformMisc::GetLSB(Uint32{Flags}));
         switch (FlagBit)
         {
             // clang-format off