Skip to content

Commit 02f5802

Browse files
TheMostDiligentTheMostDiligent
committed
RenderDeviceBase: don't use auto where not necessary
1 parent 953d186 commit 02f5802

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

‎Graphics/GraphicsEngine/include/RenderDeviceBase.hpp‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2024 Diligent Graphics LLC
2+
* Copyright 2019-2025 Diligent Graphics LLC
33
* Copyright 2015-2019 Egor Yusov
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -228,13 +228,13 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
228228
DEV_CHECK_ERR(*ppMapping == nullptr, "Overwriting reference to existing object may cause memory leaks");
229229
DEV_CHECK_ERR(ResMappingCI.pEntries == nullptr || ResMappingCI.NumEntries != 0, "Starting with API253010, the number of entries is defined through the NumEntries member.");
230230

231-
auto* pResourceMapping{NEW_RC_OBJ(m_ResMappingAllocator, "ResourceMappingImpl instance", ResourceMappingImpl)(GetRawAllocator())};
231+
ResourceMappingImpl* pResourceMapping{NEW_RC_OBJ(m_ResMappingAllocator, "ResourceMappingImpl instance", ResourceMappingImpl)(GetRawAllocator())};
232232
pResourceMapping->QueryInterface(IID_ResourceMapping, reinterpret_cast<IObject**>(ppMapping));
233233
if (ResMappingCI.pEntries != nullptr)
234234
{
235235
for (Uint32 i = 0; i < ResMappingCI.NumEntries; ++i)
236236
{
237-
const auto& Entry = ResMappingCI.pEntries[i];
237+
const ResourceMappingEntry& Entry = ResMappingCI.pEntries[i];
238238
if (Entry.Name != nullptr && Entry.pObject != nullptr)
239239
(*ppMapping)->AddResourceArray(Entry.Name, Entry.ArrayIndex, &Entry.pObject, 1, true);
240240
else
@@ -260,7 +260,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
260260
virtual const TextureFormatInfo& DILIGENT_CALL_TYPE GetTextureFormatInfo(TEXTURE_FORMAT TexFormat) const override final
261261
{
262262
VERIFY(TexFormat >= TEX_FORMAT_UNKNOWN && TexFormat < TEX_FORMAT_NUM_FORMATS, "Texture format out of range");
263-
const auto& TexFmtInfo = m_TextureFormatsInfo[TexFormat];
263+
const TextureFormatInfoExt& TexFmtInfo = m_TextureFormatsInfo[TexFormat];
264264
VERIFY(TexFmtInfo.Format == TexFormat, "Sanity check failed");
265265
return TexFmtInfo;
266266
}
@@ -269,7 +269,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
269269
virtual const TextureFormatInfoExt& DILIGENT_CALL_TYPE GetTextureFormatInfoExt(TEXTURE_FORMAT TexFormat) override final
270270
{
271271
VERIFY(TexFormat >= TEX_FORMAT_UNKNOWN && TexFormat < TEX_FORMAT_NUM_FORMATS, "Texture format out of range");
272-
const auto& TexFmtInfo = m_TextureFormatsInfo[TexFormat];
272+
const TextureFormatInfoExt& TexFmtInfo = m_TextureFormatsInfo[TexFormat];
273273
VERIFY(TexFmtInfo.Format == TexFormat, "Sanity check failed");
274274
if (!m_TexFmtInfoInitFlags[TexFormat])
275275
{
@@ -415,7 +415,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
415415
(*ppObject)->Release();
416416
*ppObject = nullptr;
417417
}
418-
const auto ObjectDescString = GetObjectDescString(Desc);
418+
const std::string ObjectDescString = GetObjectDescString(Desc);
419419
if (!ObjectDescString.empty())
420420
{
421421
LOG_ERROR("Failed to create ", ObjectTypeName, " object '", (Desc.Name ? Desc.Name : ""), "'\n", ObjectDescString);
@@ -433,7 +433,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
433433
CreateDeviceObject("Pipeline State", PSOCreateInfo.PSODesc, ppPipelineState,
434434
[&]() //
435435
{
436-
auto* pPipelineStateImpl = NEW_RC_OBJ(m_PSOAllocator, "Pipeline State instance", PipelineStateImplType)(static_cast<RenderDeviceImplType*>(this), PSOCreateInfo, ExtraArgs...);
436+
PipelineStateImplType* pPipelineStateImpl = NEW_RC_OBJ(m_PSOAllocator, "Pipeline State instance", PipelineStateImplType)(static_cast<RenderDeviceImplType*>(this), PSOCreateInfo, ExtraArgs...);
437437
pPipelineStateImpl->QueryInterface(IID_PipelineState, reinterpret_cast<IObject**>(ppPipelineState));
438438
});
439439
}
@@ -444,7 +444,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
444444
CreateDeviceObject("Buffer", BuffDesc, ppBuffer,
445445
[&]() //
446446
{
447-
auto* pBufferImpl = NEW_RC_OBJ(m_BufObjAllocator, "Buffer instance", BufferImplType)(m_BuffViewObjAllocator, static_cast<RenderDeviceImplType*>(this), BuffDesc, ExtraArgs...);
447+
BufferImplType* pBufferImpl = NEW_RC_OBJ(m_BufObjAllocator, "Buffer instance", BufferImplType)(m_BuffViewObjAllocator, static_cast<RenderDeviceImplType*>(this), BuffDesc, ExtraArgs...);
448448
pBufferImpl->QueryInterface(IID_Buffer, reinterpret_cast<IObject**>(ppBuffer));
449449
pBufferImpl->CreateDefaultViews();
450450
});
@@ -456,7 +456,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
456456
CreateDeviceObject("Texture", TexDesc, ppTexture,
457457
[&]() //
458458
{
459-
auto* pTextureImpl = NEW_RC_OBJ(m_TexObjAllocator, "Texture instance", TextureImplType)(m_TexViewObjAllocator, static_cast<RenderDeviceImplType*>(this), TexDesc, ExtraArgs...);
459+
TextureImplType* pTextureImpl = NEW_RC_OBJ(m_TexObjAllocator, "Texture instance", TextureImplType)(m_TexViewObjAllocator, static_cast<RenderDeviceImplType*>(this), TexDesc, ExtraArgs...);
460460
pTextureImpl->QueryInterface(IID_Texture, reinterpret_cast<IObject**>(ppTexture));
461461
pTextureImpl->CreateDefaultViews();
462462
});
@@ -468,7 +468,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
468468
CreateDeviceObject("Shader", ShaderCI.Desc, ppShader,
469469
[&]() //
470470
{
471-
auto* pShaderImpl = NEW_RC_OBJ(m_ShaderObjAllocator, "Shader instance", ShaderImplType)(static_cast<RenderDeviceImplType*>(this), ShaderCI, ExtraArgs...);
471+
ShaderImplType* pShaderImpl = NEW_RC_OBJ(m_ShaderObjAllocator, "Shader instance", ShaderImplType)(static_cast<RenderDeviceImplType*>(this), ShaderCI, ExtraArgs...);
472472
pShaderImpl->QueryInterface(IID_Shader, reinterpret_cast<IObject**>(ppShader));
473473
});
474474
}
@@ -479,7 +479,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
479479
CreateDeviceObject("Sampler", SamplerDesc, ppSampler,
480480
[&]() //
481481
{
482-
auto pSampler = m_SamplersRegistry.Get(
482+
RefCntAutoPtr<ISampler> pSampler = m_SamplersRegistry.Get(
483483
SamplerDesc,
484484
[&]() {
485485
return RefCntAutoPtr<ISampler>{NEW_RC_OBJ(m_SamplerObjAllocator, "Sampler instance", SamplerImplType)(static_cast<RenderDeviceImplType*>(this), SamplerDesc, ExtraArgs...)};
@@ -495,7 +495,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
495495
CreateDeviceObject("Fence", Desc, ppFence,
496496
[&]() //
497497
{
498-
auto* pFenceImpl = NEW_RC_OBJ(m_FenceAllocator, "Fence instance", FenceImplType)(static_cast<RenderDeviceImplType*>(this), Desc, ExtraArgs...);
498+
FenceImplType* pFenceImpl = NEW_RC_OBJ(m_FenceAllocator, "Fence instance", FenceImplType)(static_cast<RenderDeviceImplType*>(this), Desc, ExtraArgs...);
499499
pFenceImpl->QueryInterface(IID_Fence, reinterpret_cast<IObject**>(ppFence));
500500
});
501501
}
@@ -505,7 +505,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
505505
CreateDeviceObject("Query", Desc, ppQuery,
506506
[&]() //
507507
{
508-
auto* pQueryImpl = NEW_RC_OBJ(m_QueryAllocator, "Query instance", QueryImplType)(static_cast<RenderDeviceImplType*>(this), Desc);
508+
QueryImplType* pQueryImpl = NEW_RC_OBJ(m_QueryAllocator, "Query instance", QueryImplType)(static_cast<RenderDeviceImplType*>(this), Desc);
509509
pQueryImpl->QueryInterface(IID_Query, reinterpret_cast<IObject**>(ppQuery));
510510
});
511511
}
@@ -516,7 +516,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
516516
CreateDeviceObject("RenderPass", Desc, ppRenderPass,
517517
[&]() //
518518
{
519-
auto* pRenderPassImpl = NEW_RC_OBJ(m_RenderPassAllocator, "Render instance", RenderPassImplType)(static_cast<RenderDeviceImplType*>(this), Desc, ExtraArgs...);
519+
RenderPassImplType* pRenderPassImpl = NEW_RC_OBJ(m_RenderPassAllocator, "Render instance", RenderPassImplType)(static_cast<RenderDeviceImplType*>(this), Desc, ExtraArgs...);
520520
pRenderPassImpl->QueryInterface(IID_RenderPass, reinterpret_cast<IObject**>(ppRenderPass));
521521
});
522522
}
@@ -527,7 +527,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
527527
CreateDeviceObject("Framebuffer", Desc, ppFramebuffer,
528528
[&]() //
529529
{
530-
auto* pFramebufferImpl = NEW_RC_OBJ(m_FramebufferAllocator, "Framebuffer instance", FramebufferImplType)(static_cast<RenderDeviceImplType*>(this), Desc, ExtraArgs...);
530+
FramebufferImplType* pFramebufferImpl = NEW_RC_OBJ(m_FramebufferAllocator, "Framebuffer instance", FramebufferImplType)(static_cast<RenderDeviceImplType*>(this), Desc, ExtraArgs...);
531531
pFramebufferImpl->QueryInterface(IID_Framebuffer, reinterpret_cast<IObject**>(ppFramebuffer));
532532
});
533533
}
@@ -538,7 +538,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
538538
CreateDeviceObject("BottomLevelAS", Desc, ppBLAS,
539539
[&]() //
540540
{
541-
auto* pBottomLevelASImpl = NEW_RC_OBJ(m_BLASAllocator, "BottomLevelAS instance", BottomLevelASImplType)(static_cast<RenderDeviceImplType*>(this), Desc, ExtraArgs...);
541+
BottomLevelASImplType* pBottomLevelASImpl = NEW_RC_OBJ(m_BLASAllocator, "BottomLevelAS instance", BottomLevelASImplType)(static_cast<RenderDeviceImplType*>(this), Desc, ExtraArgs...);
542542
pBottomLevelASImpl->QueryInterface(IID_BottomLevelAS, reinterpret_cast<IObject**>(ppBLAS));
543543
});
544544
}
@@ -549,7 +549,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
549549
CreateDeviceObject("TopLevelAS", Desc, ppTLAS,
550550
[&]() //
551551
{
552-
auto* pTopLevelASImpl = NEW_RC_OBJ(m_TLASAllocator, "TopLevelAS instance", TopLevelASImplType)(static_cast<RenderDeviceImplType*>(this), Desc, ExtraArgs...);
552+
TopLevelASImplType* pTopLevelASImpl = NEW_RC_OBJ(m_TLASAllocator, "TopLevelAS instance", TopLevelASImplType)(static_cast<RenderDeviceImplType*>(this), Desc, ExtraArgs...);
553553
pTopLevelASImpl->QueryInterface(IID_TopLevelAS, reinterpret_cast<IObject**>(ppTLAS));
554554
});
555555
}
@@ -559,7 +559,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
559559
CreateDeviceObject("ShaderBindingTable", Desc, ppSBT,
560560
[&]() //
561561
{
562-
auto* pSBTImpl = NEW_RC_OBJ(m_SBTAllocator, "ShaderBindingTable instance", ShaderBindingTableImplType)(static_cast<RenderDeviceImplType*>(this), Desc);
562+
ShaderBindingTableImplType* pSBTImpl = NEW_RC_OBJ(m_SBTAllocator, "ShaderBindingTable instance", ShaderBindingTableImplType)(static_cast<RenderDeviceImplType*>(this), Desc);
563563
pSBTImpl->QueryInterface(IID_ShaderBindingTable, reinterpret_cast<IObject**>(ppSBT));
564564
});
565565
}
@@ -570,7 +570,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
570570
CreateDeviceObject("PipelineResourceSignature", Desc, ppSignature,
571571
[&]() //
572572
{
573-
auto* pPRSImpl = NEW_RC_OBJ(m_PipeResSignAllocator, "PipelineResourceSignature instance", PipelineResourceSignatureImplType)(static_cast<RenderDeviceImplType*>(this), Desc, ExtraArgs...);
573+
PipelineResourceSignatureImplType* pPRSImpl = NEW_RC_OBJ(m_PipeResSignAllocator, "PipelineResourceSignature instance", PipelineResourceSignatureImplType)(static_cast<RenderDeviceImplType*>(this), Desc, ExtraArgs...);
574574
pPRSImpl->QueryInterface(IID_PipelineResourceSignature, reinterpret_cast<IObject**>(ppSignature));
575575
});
576576
}
@@ -581,7 +581,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
581581
CreateDeviceObject("DeviceMemory", MemCI.Desc, ppMemory,
582582
[&]() //
583583
{
584-
auto* pDevMemImpl = NEW_RC_OBJ(m_MemObjAllocator, "DeviceMemory instance", DeviceMemoryImplType)(static_cast<RenderDeviceImplType*>(this), MemCI, ExtraArgs...);
584+
DeviceMemoryImplType* pDevMemImpl = NEW_RC_OBJ(m_MemObjAllocator, "DeviceMemory instance", DeviceMemoryImplType)(static_cast<RenderDeviceImplType*>(this), MemCI, ExtraArgs...);
585585
pDevMemImpl->QueryInterface(IID_DeviceMemory, reinterpret_cast<IObject**>(ppMemory));
586586
});
587587
}
@@ -591,7 +591,7 @@ class RenderDeviceBase : public ObjectBase<typename EngineImplTraits::RenderDevi
591591
CreateDeviceObject("PSOCache", PSOCacheCI.Desc, ppCache,
592592
[&]() //
593593
{
594-
auto* pPSOCacheImpl = NEW_RC_OBJ(m_PSOCacheAllocator, "PSOCache instance", PipelineStateCacheImplType)(static_cast<RenderDeviceImplType*>(this), PSOCacheCI);
594+
PipelineStateCacheImplType* pPSOCacheImpl = NEW_RC_OBJ(m_PSOCacheAllocator, "PSOCache instance", PipelineStateCacheImplType)(static_cast<RenderDeviceImplType*>(this), PSOCacheCI);
595595
pPSOCacheImpl->QueryInterface(IID_PipelineStateCache, reinterpret_cast<IObject**>(ppCache));
596596
});
597597
}

0 commit comments

Comments
 (0)