GraphicsEngineGL: don't use auto where unnecessary

Author: TheMostDiligent

Graphics/GraphicsEngineOpenGL/include/GLProgramCache.hpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2024 Diligent Graphics LLC
+ *  Copyright 2024-2025 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -82,7 +82,7 @@ class GLProgramCache
         bool IsSeparableProgram = false;
 
         std::vector<UniqueIdentifier> ShaderUIDs;
-        std::vector<UniqueIdentifier> SignaturUIDs;
+        std::vector<UniqueIdentifier> SignatureUIDs;
 
         PipelineResourceLayoutDescX ResourceLayout;
     };

Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp

@@ -224,7 +224,7 @@ void BufferGLImpl::UpdateData(GLContextState& CtxState, Uint64 Offset, Uint64 Si
         CtxState);
 
     // We must unbind VAO because otherwise we will break the bindings
-    const auto ResetVAO = m_BindTarget == GL_ARRAY_BUFFER || m_BindTarget == GL_ELEMENT_ARRAY_BUFFER;
+    const bool ResetVAO = m_BindTarget == GL_ARRAY_BUFFER || m_BindTarget == GL_ELEMENT_ARRAY_BUFFER;
     CtxState.BindBuffer(m_BindTarget, m_GlBuffer, ResetVAO);
     // All buffer bind targets (GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER etc.) relate to the same
     // kind of objects. As a result they are all equivalent from a transfer point of view.
@@ -379,7 +379,7 @@ void BufferGLImpl::Unmap(GLContextState& CtxState)
 {
     constexpr bool ResetVAO = true;
     CtxState.BindBuffer(m_BindTarget, m_GlBuffer, ResetVAO);
-    auto Result = glUnmapBuffer(m_BindTarget);
+    GLboolean Result = glUnmapBuffer(m_BindTarget);
     // glUnmapBuffer() returns TRUE unless data values in the buffer's data store have
     // become corrupted during the period that the buffer was mapped. Such corruption
     // can be the result of a screen resolution change or other window system - dependent
@@ -404,17 +404,17 @@ void BufferGLImpl::CreateViewInternal(const BufferViewDesc& OrigViewDesc, IBuffe
 
     try
     {
-        auto* const pDeviceGLImpl = GetDevice();
+        RenderDeviceGLImpl* const pDeviceGLImpl = GetDevice();
 
-        auto ViewDesc = OrigViewDesc;
+        BufferViewDesc ViewDesc = OrigViewDesc;
         ValidateAndCorrectBufferViewDesc(m_Desc, ViewDesc, pDeviceGLImpl->GetAdapterInfo().Buffer.StructuredBufferOffsetAlignment);
 
-        auto& BuffViewAllocator = pDeviceGLImpl->GetBuffViewObjAllocator();
+        FixedBlockMemoryAllocator& BuffViewAllocator = pDeviceGLImpl->GetBuffViewObjAllocator();
         VERIFY(&BuffViewAllocator == &m_dbgBuffViewAllocator, "Buff view allocator does not match allocator provided at buffer initialization");
 
-        auto pContext = pDeviceGLImpl->GetImmediateContext(0);
+        RefCntAutoPtr<DeviceContextGLImpl> pContext = pDeviceGLImpl->GetImmediateContext(0);
         VERIFY(pContext, "Immediate context has been released");
-        auto& CtxState = pContext->GetContextState();
+        GLContextState& CtxState = pContext->GetContextState();
 
         *ppView = NEW_RC_OBJ(BuffViewAllocator, "BufferViewGLImpl instance", BufferViewGLImpl, bIsDefaultView ? this : nullptr)(pDeviceGLImpl, CtxState, ViewDesc, this, bIsDefaultView);
 
@@ -423,7 +423,7 @@ void BufferGLImpl::CreateViewInternal(const BufferViewDesc& OrigViewDesc, IBuffe
     }
     catch (const std::runtime_error&)
     {
-        const auto* ViewTypeName = GetBufferViewTypeLiteralName(OrigViewDesc.ViewType);
+        const char* ViewTypeName = GetBufferViewTypeLiteralName(OrigViewDesc.ViewType);
         LOG_ERROR("Failed to create view '", (OrigViewDesc.Name ? OrigViewDesc.Name : ""), "' (", ViewTypeName, ") for buffer '", (m_Desc.Name ? m_Desc.Name : ""), "'");
     }
 }

Graphics/GraphicsEngineOpenGL/src/BufferViewGLImpl.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");
@@ -55,7 +55,7 @@ BufferViewGLImpl::BufferViewGLImpl(IReferenceCounters*   pRefCounters,
     m_GLTexBuffer{false}
 // clang-format on
 {
-    const auto& BuffDesc = pBuffer->GetDesc();
+    const BufferDesc& BuffDesc = pBuffer->GetDesc();
     if ((ViewDesc.ViewType == BUFFER_VIEW_SHADER_RESOURCE || ViewDesc.ViewType == BUFFER_VIEW_UNORDERED_ACCESS) &&
         (BuffDesc.Mode == BUFFER_MODE_FORMATTED || BuffDesc.Mode == BUFFER_MODE_RAW))
     {
@@ -71,8 +71,8 @@ BufferViewGLImpl::BufferViewGLImpl(IReferenceCounters*   pRefCounters,
         m_GLTexBuffer.Create();
         CtxState.BindTexture(-1, GL_TEXTURE_BUFFER, m_GLTexBuffer);
 
-        const auto& BuffFmt  = ViewDesc.Format;
-        GLenum      GLFormat = 0;
+        const BufferFormat& BuffFmt  = ViewDesc.Format;
+        GLenum              GLFormat = 0;
         if (BuffDesc.Mode == BUFFER_MODE_FORMATTED || BuffFmt.ValueType != VT_UNDEFINED)
         {
             GLFormat = TypeToGLTexFormat(BuffFmt.ValueType, BuffFmt.NumComponents, BuffFmt.IsNormalized);

Graphics/GraphicsEngineOpenGL/src/FenceGLImpl.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 FenceGLImpl::GetCompletedValue()
     {
         auto& val_fence = m_PendingFences.front();
 
-        auto res =
+        GLenum res =
             glClientWaitSync(val_fence.second,
                              0, // Can be SYNC_FLUSH_COMMANDS_BIT
                              0  // Timeout in nanoseconds
@@ -91,7 +91,7 @@ void FenceGLImpl::HostWait(Uint64 Value, bool FlushCommands)
         if (val_fence.first > Value)
             break;
 
-        auto res = glClientWaitSync(val_fence.second, FlushCommands ? GL_SYNC_FLUSH_COMMANDS_BIT : 0, std::numeric_limits<GLuint64>::max());
+        GLenum res = glClientWaitSync(val_fence.second, FlushCommands ? GL_SYNC_FLUSH_COMMANDS_BIT : 0, std::numeric_limits<GLuint64>::max());
         VERIFY_EXPR(res == GL_ALREADY_SIGNALED || res == GL_CONDITION_SATISFIED);
         (void)res;
 

Graphics/GraphicsEngineOpenGL/src/FramebufferGLImpl.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");
@@ -86,47 +86,47 @@ FramebufferGLImpl::FramebufferGLImpl(IReferenceCounters*    pRefCounters,
                                      GLContextState&        CtxState) :
     TFramebufferBase{pRefCounters, pDevice, Desc}
 {
-    const auto& RPDesc = m_Desc.pRenderPass->GetDesc();
+    const RenderPassDesc& RPDesc = m_Desc.pRenderPass->GetDesc();
     m_SubpassFramebuffers.reserve(RPDesc.SubpassCount);
     for (Uint32 subpass = 0; subpass < RPDesc.SubpassCount; ++subpass)
     {
-        const auto& SubpassDesc = RPDesc.pSubpasses[subpass];
+        const SubpassDesc& SPDesc = RPDesc.pSubpasses[subpass];
 
         TextureViewGLImpl* ppRTVs[MAX_RENDER_TARGETS] = {};
         TextureViewGLImpl* pDSV                       = nullptr;
 
-        for (Uint32 rt = 0; rt < SubpassDesc.RenderTargetAttachmentCount; ++rt)
+        for (Uint32 rt = 0; rt < SPDesc.RenderTargetAttachmentCount; ++rt)
         {
-            const auto& RTAttachmentRef = SubpassDesc.pRenderTargetAttachments[rt];
+            const AttachmentReference& RTAttachmentRef = SPDesc.pRenderTargetAttachments[rt];
             if (RTAttachmentRef.AttachmentIndex != ATTACHMENT_UNUSED)
             {
                 ppRTVs[rt] = ClassPtrCast<TextureViewGLImpl>(m_Desc.ppAttachments[RTAttachmentRef.AttachmentIndex]);
             }
         }
 
-        if (SubpassDesc.pDepthStencilAttachment != nullptr && SubpassDesc.pDepthStencilAttachment->AttachmentIndex != ATTACHMENT_UNUSED)
+        if (SPDesc.pDepthStencilAttachment != nullptr && SPDesc.pDepthStencilAttachment->AttachmentIndex != ATTACHMENT_UNUSED)
         {
-            pDSV = ClassPtrCast<TextureViewGLImpl>(m_Desc.ppAttachments[SubpassDesc.pDepthStencilAttachment->AttachmentIndex]);
+            pDSV = ClassPtrCast<TextureViewGLImpl>(m_Desc.ppAttachments[SPDesc.pDepthStencilAttachment->AttachmentIndex]);
         }
-        auto RenderTargetFBO = UseDefaultFBO(SubpassDesc.RenderTargetAttachmentCount, ppRTVs, pDSV) ?
+        GLObjectWrappers::GLFrameBufferObj RenderTargetFBO = UseDefaultFBO(SPDesc.RenderTargetAttachmentCount, ppRTVs, pDSV) ?
             GLObjectWrappers::GLFrameBufferObj{false} :
-            FBOCache::CreateFBO(CtxState, SubpassDesc.RenderTargetAttachmentCount, ppRTVs, pDSV, Desc.Width, Desc.Height);
+            FBOCache::CreateFBO(CtxState, SPDesc.RenderTargetAttachmentCount, ppRTVs, pDSV, Desc.Width, Desc.Height);
 
         GLObjectWrappers::GLFrameBufferObj ResolveFBO{false};
-        if (SubpassDesc.pResolveAttachments != nullptr)
+        if (SPDesc.pResolveAttachments != nullptr)
         {
             TextureViewGLImpl* ppRsvlViews[MAX_RENDER_TARGETS] = {};
-            for (Uint32 rt = 0; rt < SubpassDesc.RenderTargetAttachmentCount; ++rt)
+            for (Uint32 rt = 0; rt < SPDesc.RenderTargetAttachmentCount; ++rt)
             {
-                const auto& RslvAttachmentRef = SubpassDesc.pResolveAttachments[rt];
+                const AttachmentReference& RslvAttachmentRef = SPDesc.pResolveAttachments[rt];
                 if (RslvAttachmentRef.AttachmentIndex != ATTACHMENT_UNUSED)
                 {
                     ppRsvlViews[rt] = ClassPtrCast<TextureViewGLImpl>(m_Desc.ppAttachments[RslvAttachmentRef.AttachmentIndex]);
                 }
             }
-            ResolveFBO = UseDefaultFBO(SubpassDesc.RenderTargetAttachmentCount, ppRsvlViews, nullptr) ?
+            ResolveFBO = UseDefaultFBO(SPDesc.RenderTargetAttachmentCount, ppRsvlViews, nullptr) ?
                 GLObjectWrappers::GLFrameBufferObj{false} :
-                FBOCache::CreateFBO(CtxState, SubpassDesc.RenderTargetAttachmentCount, ppRsvlViews, nullptr, Desc.Width, Desc.Height);
+                FBOCache::CreateFBO(CtxState, SPDesc.RenderTargetAttachmentCount, ppRsvlViews, nullptr, Desc.Width, Desc.Height);
         }
 
         RenderTargetFBO.SetName(m_Desc.Name);

Graphics/GraphicsEngineOpenGL/src/GLContextWindows.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");
@@ -70,7 +70,7 @@ GLContext::GLContext(const EngineGLCreateInfo& InitAttribs,
         pfd.iPixelType = PFD_TYPE_RGBA;
         if (pSCDesc != nullptr)
         {
-            auto ColorFmt = pSCDesc->ColorBufferFormat;
+            TEXTURE_FORMAT ColorFmt = pSCDesc->ColorBufferFormat;
             if (ColorFmt == TEX_FORMAT_RGBA8_UNORM || ColorFmt == TEX_FORMAT_RGBA8_UNORM_SRGB ||
                 ColorFmt == TEX_FORMAT_BGRA8_UNORM || ColorFmt == TEX_FORMAT_BGRA8_UNORM_SRGB)
             {
@@ -83,7 +83,7 @@ GLContext::GLContext(const EngineGLCreateInfo& InitAttribs,
                 pfd.cColorBits = 32;
             }
 
-            auto DepthFmt = pSCDesc->DepthBufferFormat;
+            TEXTURE_FORMAT DepthFmt = pSCDesc->DepthBufferFormat;
             switch (DepthFmt)
             {
                 case TEX_FORMAT_UNKNOWN:
@@ -191,7 +191,7 @@ GLContext::GLContext(const EngineGLCreateInfo& InitAttribs,
     }
     else
     {
-        auto CurrentCtx = wglGetCurrentContext();
+        HGLRC CurrentCtx = wglGetCurrentContext();
         if (CurrentCtx == 0)
         {
             LOG_ERROR_AND_THROW("No current GL context found! Provide non-null handle to a native Window to create a GL context");

Graphics/GraphicsEngineOpenGL/src/GLProgram.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2024 Diligent Graphics LLC
+ *  Copyright 2024-2025 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ GLProgram::GLProgram(ShaderGLImpl* const* ppShaders,
 
     for (Uint32 i = 0; i < NumShaders; ++i)
     {
-        auto* pCurrShader = ppShaders[i];
+        ShaderGLImpl* pCurrShader = ppShaders[i];
         glAttachShader(m_GLProg, pCurrShader->GetGLShaderHandle());
         DEV_CHECK_GL_ERROR("glAttachShader() failed");
     }

Graphics/GraphicsEngineOpenGL/src/GLProgramCache.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2024 Diligent Graphics LLC
+ *  Copyright 2024-2025 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -51,21 +51,21 @@ GLProgramCache::ProgramCacheKey::ProgramCacheKey(const GetProgramAttribs& Attrib
     ShaderUIDs.reserve(Attribs.NumShaders);
     for (Uint32 i = 0; i < Attribs.NumShaders; ++i)
     {
-        auto ShaderUID = Attribs.ppShaders[i]->GetUniqueID();
+        Int32 ShaderUID = Attribs.ppShaders[i]->GetUniqueID();
         HashCombine(Hash, ShaderUID);
         ShaderUIDs.push_back(ShaderUID);
     }
 
     if (Attribs.NumSignatures != 0)
     {
-        SignaturUIDs.reserve(Attribs.NumSignatures);
+        SignatureUIDs.reserve(Attribs.NumSignatures);
         for (Uint32 i = 0; i < Attribs.NumSignatures; ++i)
         {
             if (PipelineResourceSignatureGLImpl* pSignature = ClassPtrCast<PipelineResourceSignatureGLImpl>(Attribs.ppSignatures[i]))
             {
-                auto SignaturUID = pSignature->GetUniqueID();
-                HashCombine(Hash, SignaturUID);
-                SignaturUIDs.push_back(SignaturUID);
+                Int32 SignatureUID = pSignature->GetUniqueID();
+                HashCombine(Hash, SignatureUID);
+                SignatureUIDs.push_back(SignatureUID);
             }
         }
     }
@@ -83,8 +83,8 @@ bool GLProgramCache::ProgramCacheKey::operator==(const ProgramCacheKey& Key) con
     return (Hash               == Key.Hash               &&
             IsSeparableProgram == Key.IsSeparableProgram &&
             ShaderUIDs         == Key.ShaderUIDs         &&
-            SignaturUIDs       == Key.SignaturUIDs       &&
-            (!SignaturUIDs.empty() || ResourceLayout == Key.ResourceLayout));
+            SignatureUIDs       == Key.SignatureUIDs       &&
+            (!SignatureUIDs.empty() || ResourceLayout == Key.ResourceLayout));
     // clang-format on
 }
 
@@ -122,7 +122,7 @@ GLProgramCache::SharedGLProgramObjPtr GLProgramCache::GetProgram(const GetProgra
 
     auto it_inserted = m_Cache.emplace(Key, NewProgram);
     // Check if the proram is valid
-    if (auto Program = it_inserted.first->second.lock())
+    if (SharedGLProgramObjPtr Program = it_inserted.first->second.lock())
     {
         return Program;
     }

Graphics/GraphicsEngineOpenGL/src/GLTypeConversions.cpp

@@ -195,7 +195,7 @@ GLenum TexFormatToGLInternalTexFormat(TEXTURE_FORMAT TexFormat, Uint32 BindFlags
     static const FormatToGLInternalTexFormatMap FormatMap;
     if (TexFormat >= TEX_FORMAT_UNKNOWN && TexFormat < TEX_FORMAT_NUM_FORMATS)
     {
-        auto GLFormat = FormatMap[TexFormat];
+        GLenum GLFormat = FormatMap[TexFormat];
         if (BindFlags != 0)
             GLFormat = CorrectGLTexFormat(GLFormat, BindFlags);
         return GLFormat;
@@ -217,7 +217,7 @@ class InternalTexFormatToTexFormatMap
     {
         for (TEXTURE_FORMAT TexFmt = TEX_FORMAT_UNKNOWN; TexFmt < TEX_FORMAT_NUM_FORMATS; TexFmt = static_cast<TEXTURE_FORMAT>(static_cast<int>(TexFmt) + 1))
         {
-            auto ComponentType = GetTextureFormatAttribs(TexFmt).ComponentType;
+            COMPONENT_TYPE ComponentType = GetTextureFormatAttribs(TexFmt).ComponentType;
             if (ComponentType == COMPONENT_TYPE_UNDEFINED ||
                 ComponentType == COMPONENT_TYPE_DEPTH_STENCIL || // Skip depth-stencil
                 TexFmt == TEX_FORMAT_RGB10A2_TYPELESS ||         // and typeless formats
@@ -235,7 +235,7 @@ class InternalTexFormatToTexFormatMap
                 continue;
             }
 
-            auto GlTexFormat = TexFormatToGLInternalTexFormat(TexFmt);
+            GLenum GlTexFormat = TexFormatToGLInternalTexFormat(TexFmt);
             if (GlTexFormat != 0)
             {
                 VERIFY_EXPR(m_FormatMap.find(GlTexFormat) == m_FormatMap.end());
@@ -745,7 +745,7 @@ SHADER_TYPE GLShaderBitsToShaderTypes(GLenum ShaderBits)
     SHADER_TYPE Result = SHADER_TYPE_UNKNOWN;
     while (ShaderBits != 0)
     {
-        auto Type = ExtractLSB(ShaderBits);
+        GLenum Type = ExtractLSB(ShaderBits);
         switch (Type)
         {
             // clang-format off
@@ -766,7 +766,7 @@ WAVE_FEATURE GLSubgroupFeatureBitsToWaveFeatures(GLenum FeatureBits)
     WAVE_FEATURE Result = WAVE_FEATURE_UNKNOWN;
     while (FeatureBits != 0)
     {
-        auto Feature = ExtractLSB(FeatureBits);
+        GLenum Feature = ExtractLSB(FeatureBits);
         switch (Feature)
         {
             // clang-format off