Skip to content

Commit f8f37a6

Browse files
TheMostDiligentTheMostDiligent
committed
GraphicsEngineWebGPU: don't use auto where unnecessary
1 parent 79a2e12 commit f8f37a6

File tree

8 files changed

+32
-32
lines changed

8 files changed

+32
-32
lines changed

‎Graphics/GraphicsEngineWebGPU/src/DeviceContextWebGPUImpl.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1828,7 +1828,7 @@ void DeviceContextWebGPUImpl::CommitRenderTargets()
18281828
WGPURenderPassDepthStencilAttachment wgpuRenderPassDepthStencilAttachment{};
18291829
for (Uint32 RTIndex = 0; RTIndex < m_NumBoundRenderTargets; ++RTIndex)
18301830
{
1831-
if (auto* pRTV = m_pBoundRenderTargets[RTIndex].RawPtr())
1831+
if (TextureViewWebGPUImpl* pRTV = m_pBoundRenderTargets[RTIndex])
18321832
{
18331833
const auto& ClearColor = m_PendingClears.Colors[RTIndex];
18341834

‎Graphics/GraphicsEngineWebGPU/src/DynamicMemoryManagerWebGPU.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 Diligent Graphics LLC
2+
* Copyright 2024-2025 Diligent Graphics LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -160,7 +160,7 @@ DynamicMemoryManagerWebGPU::Page DynamicMemoryManagerWebGPU::GetPage(size_t Size
160160
{
161161
if (PageSize <= Iter->GetSize())
162162
{
163-
auto Result = std::move(*Iter);
163+
Page Result = std::move(*Iter);
164164
m_AvailablePages.erase(Iter);
165165
return Result;
166166
}

‎Graphics/GraphicsEngineWebGPU/src/GenerateMipsHelperWebGPU.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ size_t GenerateMipsHelperWebGPU::ComputePipelineHashKey::GetHash() const
308308
if (Hash == 0)
309309
{
310310
Hash = ComputeHash(PowerOfTwo);
311-
for (const auto& Format : Formats)
311+
for (const TEXTURE_FORMAT& Format : Formats)
312312
HashCombine(Hash, Format);
313313
}
314314
return Hash;
@@ -328,7 +328,7 @@ size_t GenerateMipsHelperWebGPU::ShaderModuleCacheKey::GetHash() const
328328
{
329329
if (Hash == 0)
330330
{
331-
for (const auto& Format : Formats)
331+
for (const TEXTURE_FORMAT& Format : Formats)
332332
HashCombine(Hash, Format);
333333
HashCombine(Hash, ShaderType);
334334
}
@@ -341,18 +341,18 @@ GenerateMipsHelperWebGPU::GenerateMipsHelperWebGPU(RenderDeviceWebGPUImpl& Devic
341341

342342
void GenerateMipsHelperWebGPU::GenerateMips(DeviceContextWebGPUImpl* pDeviceContext, TextureViewWebGPUImpl* pTexView)
343343
{
344-
auto* pTexWGPU = pTexView->GetTexture<TextureWebGPUImpl>();
345-
const auto& TexDesc = pTexWGPU->GetDesc();
346-
const auto& FmtInfo = m_DeviceWebGPU.GetTextureFormatInfoExt(SRGBFormatToUnorm(TexDesc.Format));
344+
TextureWebGPUImpl* pTexWGPU = pTexView->GetTexture<TextureWebGPUImpl>();
345+
const TextureDesc& TexDesc = pTexWGPU->GetDesc();
346+
const TextureFormatInfoExt& FmtInfo = m_DeviceWebGPU.GetTextureFormatInfoExt(SRGBFormatToUnorm(TexDesc.Format));
347347

348348
if (FmtInfo.BindFlags & BIND_UNORDERED_ACCESS)
349349
{
350-
auto CmdEncoder = pDeviceContext->GetComputePassCommandEncoder();
350+
WGPUComputePassEncoder CmdEncoder = pDeviceContext->GetComputePassCommandEncoder();
351351
GenerateMips(CmdEncoder, pDeviceContext, pTexView);
352352
}
353353
else
354354
{
355-
auto CmdEncoder = pDeviceContext->GetCommandEncoder();
355+
WGPUCommandEncoder CmdEncoder = pDeviceContext->GetCommandEncoder();
356356
GenerateMips(CmdEncoder, pDeviceContext, pTexView);
357357
}
358358
}
@@ -645,7 +645,7 @@ void GenerateMipsHelperWebGPU::GenerateMips(WGPUComputePassEncoder wgpuCmdEncode
645645
UAVFormats PipelineFormats{};
646646
for (Uint32 UAVIndex = 0; UAVIndex < 4; ++UAVIndex)
647647
{
648-
const auto* pTextureViewImpl = ClassPtrCast<TextureViewWebGPUImpl>(m_PlaceholderTextureViews[UAVIndex].RawPtr());
648+
const TextureViewWebGPUImpl* pTextureViewImpl = ClassPtrCast<TextureViewWebGPUImpl>(m_PlaceholderTextureViews[UAVIndex].RawPtr());
649649
wgpuBindGroupEntries[UAVIndex + 1].binding = UAVIndex + 1;
650650
wgpuBindGroupEntries[UAVIndex + 1].textureView = UAVIndex < NumMips ? pTexView->GetMipLevelUAV(TopMip + UAVIndex + 1) : pTextureViewImpl->GetWebGPUTextureView();
651651
PipelineFormats[UAVIndex] = UAVIndex < NumMips ? pTexView->GetDesc().Format : PlaceholderTextureFormat;
@@ -683,7 +683,7 @@ void GenerateMipsHelperWebGPU::GenerateMips(WGPUCommandEncoder wgpuCmdEncoder, D
683683
InitializeSampler();
684684
pDeviceContext->EndCommandEncoders(DeviceContextWebGPUImpl::COMMAND_ENCODER_FLAG_ALL);
685685

686-
const auto& ViewDesc = pTexView->GetDesc();
686+
const TextureViewDesc& ViewDesc = pTexView->GetDesc();
687687

688688
for (Uint32 TopSlice = 0; TopSlice < ViewDesc.NumArraySlices; ++TopSlice)
689689
{

‎Graphics/GraphicsEngineWebGPU/src/PipelineResourceSignatureWebGPUImpl.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ void PipelineResourceSignatureWebGPUImpl::CreateBindGroupLayouts(const bool IsSe
549549
}
550550
VERIFY_EXPR(BindGroupIndex != ~0u && BindingIndex != ~0u && CacheOffset != ~0u);
551551

552-
auto* const pAttribs = m_pResourceAttribs + i;
552+
ResourceAttribs* const pAttribs = m_pResourceAttribs + i;
553553
if (!IsSerialized)
554554
{
555555
new (pAttribs) ResourceAttribs{

‎Graphics/GraphicsEngineWebGPU/src/QueryManagerWebGPU.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023-2024 Diligent Graphics LLC
2+
* Copyright 2023-2025 Diligent Graphics LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -152,8 +152,8 @@ QueryManagerWebGPU::QuerySetObject::QuerySetObject(IReferenceCounters* pRefC
152152

153153
String QueryObjectName = String{"QueryManagerWebGPU: QuerySetObject["} + GetQueryTypeString(m_Type) + "]";
154154

155-
auto StrSize = QueryObjectName.size() + 1;
156-
auto* NameCopy = ALLOCATE(GetStringAllocator(), "Object name copy", char, StrSize);
155+
size_t StrSize = QueryObjectName.size() + 1;
156+
char* NameCopy = ALLOCATE(GetStringAllocator(), "Object name copy", char, StrSize);
157157
memcpy(NameCopy, QueryObjectName.c_str(), StrSize);
158158
m_Desc.Name = NameCopy;
159159
}
@@ -164,7 +164,7 @@ QueryManagerWebGPU::QuerySetObject::~QuerySetObject()
164164

165165
if (m_AvailableQueries.size() != m_QueryCount)
166166
{
167-
const auto OutstandingQueries = m_QueryCount - m_AvailableQueries.size();
167+
const size_t OutstandingQueries = m_QueryCount - m_AvailableQueries.size();
168168
if (OutstandingQueries == 1)
169169
{
170170
LOG_ERROR_MESSAGE("One query of type ", GetQueryTypeString(m_Type),

‎Graphics/GraphicsEngineWebGPU/src/QueryWebGPUImpl.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023-2024 Diligent Graphics LLC
2+
* Copyright 2023-2025 Diligent Graphics LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ bool QueryWebGPUImpl::AllocateQueries()
6060
VERIFY_EXPR(m_pQueryMgr != nullptr);
6161
for (Uint32 Index = 0; Index < (m_Desc.Type == QUERY_TYPE_DURATION ? Uint32{2} : Uint32{1}); ++Index)
6262
{
63-
auto& QuerySetIdx = m_QuerySetIndices[Index];
63+
Uint32& QuerySetIdx = m_QuerySetIndices[Index];
6464
VERIFY_EXPR(QuerySetIdx == QueryManagerWebGPU::InvalidIndex);
6565
QuerySetIdx = m_pQueryMgr->AllocateQuery(m_Desc.Type);
6666

@@ -77,7 +77,7 @@ bool QueryWebGPUImpl::AllocateQueries()
7777

7878
void QueryWebGPUImpl::DiscardQueries()
7979
{
80-
for (auto& QuerySetIdx : m_QuerySetIndices)
80+
for (Uint32& QuerySetIdx : m_QuerySetIndices)
8181
{
8282
if (QuerySetIdx != QueryManagerWebGPU::InvalidIndex)
8383
{
@@ -102,33 +102,33 @@ bool QueryWebGPUImpl::GetData(void* pData, Uint32 DataSize, bool AutoInvalidate)
102102
{
103103
case QUERY_TYPE_TIMESTAMP:
104104
{
105-
const auto Timestamp = m_pQueryMgr->GetQueryResult(m_Desc.Type, m_QuerySetIndices[0]);
105+
const Uint64 Timestamp = m_pQueryMgr->GetQueryResult(m_Desc.Type, m_QuerySetIndices[0]);
106106
if (pData != nullptr)
107107
{
108-
auto& QueryData = *reinterpret_cast<QueryDataTimestamp*>(pData);
108+
QueryDataTimestamp& QueryData{*reinterpret_cast<QueryDataTimestamp*>(pData)};
109109
QueryData.Counter = Timestamp;
110110
QueryData.Frequency = 1000000000u; // Nanoseconds to seconds
111111
}
112112
break;
113113
}
114114
case QUERY_TYPE_DURATION:
115115
{
116-
const auto T0 = m_pQueryMgr->GetQueryResult(m_Desc.Type, m_QuerySetIndices[0]);
117-
const auto T1 = m_pQueryMgr->GetQueryResult(m_Desc.Type, m_QuerySetIndices[1]);
116+
const Uint64 T0 = m_pQueryMgr->GetQueryResult(m_Desc.Type, m_QuerySetIndices[0]);
117+
const Uint64 T1 = m_pQueryMgr->GetQueryResult(m_Desc.Type, m_QuerySetIndices[1]);
118118
if (pData != nullptr)
119119
{
120-
auto& QueryData = *reinterpret_cast<QueryDataDuration*>(pData);
120+
QueryDataDuration& QueryData{*reinterpret_cast<QueryDataDuration*>(pData)};
121121
QueryData.Duration = T1 - T0;
122122
QueryData.Frequency = 1000000000u; // Nanoseconds to seconds
123123
}
124124
break;
125125
}
126126
case QUERY_TYPE_OCCLUSION:
127127
{
128-
const auto NumSamples = m_pQueryMgr->GetQueryResult(m_Desc.Type, m_QuerySetIndices[0]);
128+
const Uint64 NumSamples = m_pQueryMgr->GetQueryResult(m_Desc.Type, m_QuerySetIndices[0]);
129129
if (pData != nullptr)
130130
{
131-
auto& QueryData = *reinterpret_cast<QueryDataOcclusion*>(pData);
131+
QueryDataOcclusion& QueryData{*reinterpret_cast<QueryDataOcclusion*>(pData)};
132132
QueryData.NumSamples = NumSamples;
133133
}
134134
break;

‎Graphics/GraphicsEngineWebGPU/src/ShaderVariableManagerWebGPU.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 Diligent Graphics LLC
2+
* Copyright 2024-2025 Diligent Graphics LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -145,7 +145,7 @@ Uint32 ShaderVariableManagerWebGPU::GetVariableIndex(const ShaderVariableWebGPUI
145145
return ~0u;
146146
}
147147

148-
const auto Offset = reinterpret_cast<const Uint8*>(&Variable) - reinterpret_cast<Uint8*>(m_pVariables);
148+
const ptrdiff_t Offset = reinterpret_cast<const Uint8*>(&Variable) - reinterpret_cast<Uint8*>(m_pVariables);
149149
DEV_CHECK_ERR(Offset % sizeof(ShaderVariableWebGPUImpl) == 0, "Offset is not multiple of ShaderVariableWebGPUImpl class size");
150150
const Uint32 Index = static_cast<Uint32>(Offset / sizeof(ShaderVariableWebGPUImpl));
151151
if (Index < m_NumVariables)

‎Graphics/GraphicsEngineWebGPU/src/TextureWebGPUImpl.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ WGPUTextureDescriptor TextureDescToWGPUTextureDescriptor(const TextureDesc&
124124
ViewFormatSet.insert(SRGBFormatToUnorm(Desc.Format));
125125
}
126126

127-
for (const auto& TextureViewFmt : ViewFormatSet)
127+
for (const TEXTURE_FORMAT& TextureViewFmt : ViewFormatSet)
128128
TextureViewFormats.push_back(TextureFormatToWGPUFormat(TextureViewFmt));
129129

130130
wgpuTextureDesc.viewFormats = TextureViewFormats.data();
@@ -520,7 +520,7 @@ void TextureWebGPUImpl::CreateViewInternal(const TextureViewDesc& ViewDesc, ITex
520520

521521
try
522522
{
523-
auto& TexViewAllocator = m_pDevice->GetTexViewObjAllocator();
523+
FixedBlockMemoryAllocator& TexViewAllocator = m_pDevice->GetTexViewObjAllocator();
524524
VERIFY(&TexViewAllocator == &m_dbgTexViewObjAllocator, "Texture view allocator does not match allocator provided during texture initialization");
525525

526526
TextureViewDesc UpdatedViewDesc = ViewDesc;
@@ -535,7 +535,7 @@ void TextureWebGPUImpl::CreateViewInternal(const TextureViewDesc& ViewDesc, ITex
535535
std::vector<WebGPUTextureViewWrapper> wgpuTextureMipUAVs;
536536
if (UpdatedViewDesc.Flags & TEXTURE_VIEW_FLAG_ALLOW_MIP_MAP_GENERATION)
537537
{
538-
const auto& FmtInfo = m_pDevice->GetTextureFormatInfoExt(SRGBFormatToUnorm(UpdatedViewDesc.Format));
538+
const TextureFormatInfoExt& FmtInfo = m_pDevice->GetTextureFormatInfoExt(SRGBFormatToUnorm(UpdatedViewDesc.Format));
539539
VERIFY_EXPR((m_Desc.MiscFlags & MISC_TEXTURE_FLAG_GENERATE_MIPS) != 0 && m_Desc.Is2D());
540540

541541
if (FmtInfo.BindFlags & BIND_UNORDERED_ACCESS)

0 commit comments

Comments
 (0)