Skip to content

Commit 475de54

Browse files
committed
fix formatting.
1 parent c67819d commit 475de54

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

Graphics/Archiver/src/Archiver_Vk.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ void SerializedPipelineStateImpl::PatchShadersVk(const CreateInfoType& CreateInf
128128
{
129129
ShaderStageInfoVk& Src{ShaderStages[i]};
130130
PipelineStateVkImpl::ShaderStageInfo& Dst{ShaderStagesVk[i]};
131-
Dst.Type = Src.Type;
132-
Dst.Shaders = std::move(Src.Shaders);
133-
Dst.SPIRVs = std::move(Src.SPIRVs);
131+
Dst.Type = Src.Type;
132+
Dst.Shaders = std::move(Src.Shaders);
133+
Dst.SPIRVs = std::move(Src.SPIRVs);
134134
Dst.ShaderResources = std::move(Src.ShaderResources);
135135
}
136136

Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ class PipelineStateVkImpl final : public PipelineStateBase<EngineVkImplTraits>
8484
// Shader stage type. All shaders in the stage must have the same type.
8585
SHADER_TYPE Type = SHADER_TYPE_UNKNOWN;
8686

87-
std::vector<const ShaderVkImpl*> Shaders;
88-
std::vector<std::vector<uint32_t>> SPIRVs;
89-
std::vector<std::shared_ptr<const SPIRVShaderResources>> ShaderResources;//This can be also updated due to push constant
87+
std::vector<const ShaderVkImpl*> Shaders;
88+
std::vector<std::vector<uint32_t>> SPIRVs;
89+
std::vector<std::shared_ptr<const SPIRVShaderResources>> ShaderResources; //This can be also updated due to push constant
9090

9191
friend SHADER_TYPE GetShaderStageType(const ShaderStageInfo& Stage) { return Stage.Type; }
9292
};
@@ -137,8 +137,8 @@ class PipelineStateVkImpl final : public PipelineStateBase<EngineVkImplTraits>
137137
bool InitPushConstantInfoFromSignatures(PushConstantInfoVk& PushConstant,
138138
TShaderStages& ShaderStages) const noexcept(false);
139139

140-
void PatchShaderConvertUniformBufferToPushConstant(const PushConstantInfoVk& PushConstant,
141-
TShaderStages& ShaderStages) const noexcept(false);
140+
void PatchShaderConvertUniformBufferToPushConstant(const PushConstantInfoVk& PushConstant,
141+
TShaderStages& ShaderStages) const noexcept(false);
142142

143143
// TPipelineStateBase::Construct needs access to InitializePipeline
144144
friend TPipelineStateBase;

Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -691,8 +691,8 @@ void PipelineStateVkImpl::RemapOrVerifyShaderResources(
691691
// remap resource bindings.
692692
for (size_t s = 0; s < ShaderStages.size(); ++s)
693693
{
694-
const std::vector<const ShaderVkImpl*>& Shaders = ShaderStages[s].Shaders;
695-
std::vector<std::vector<uint32_t>>& SPIRVs = ShaderStages[s].SPIRVs;
694+
const std::vector<const ShaderVkImpl*>& Shaders = ShaderStages[s].Shaders;
695+
std::vector<std::vector<uint32_t>>& SPIRVs = ShaderStages[s].SPIRVs;
696696
const SHADER_TYPE ShaderType = ShaderStages[s].Type;
697697
std::vector<std::shared_ptr<const SPIRVShaderResources>>& ShaderResources = ShaderStages[s].ShaderResources;
698698

@@ -701,8 +701,8 @@ void PipelineStateVkImpl::RemapOrVerifyShaderResources(
701701

702702
for (size_t i = 0; i < Shaders.size(); ++i)
703703
{
704-
const ShaderVkImpl* pShader = Shaders[i];
705-
std::vector<uint32_t>& SPIRV = SPIRVs[i];
704+
const ShaderVkImpl* pShader = Shaders[i];
705+
std::vector<uint32_t>& SPIRV = SPIRVs[i];
706706
const std::shared_ptr<const SPIRVShaderResources>& pShaderResources = ShaderResources[i];
707707

708708
//const auto& pShaderResources = pShader->GetShaderResources();
@@ -971,7 +971,7 @@ void PipelineStateVkImpl::InitPipelineLayout(const PipelineStateCreateInfo& Crea
971971
}
972972

973973
void PipelineStateVkImpl::PatchShaderConvertUniformBufferToPushConstant(const PushConstantInfoVk& PushConstantInfo,
974-
TShaderStages& ShaderStages) const noexcept(false)
974+
TShaderStages& ShaderStages) const noexcept(false)
975975
{
976976
// If no push constant was selected, no patching needed
977977
if (PushConstantInfo.SignatureIndex == INVALID_PUSH_CONSTANT_INDEX ||
@@ -991,7 +991,7 @@ void PipelineStateVkImpl::PatchShaderConvertUniformBufferToPushConstant(const Pu
991991
{
992992
for (size_t i = 0; i < Stage.Shaders.size(); ++i)
993993
{
994-
ShaderVkImpl* pShader = const_cast<ShaderVkImpl*>(Stage.Shaders[i]);
994+
ShaderVkImpl* pShader = const_cast<ShaderVkImpl*>(Stage.Shaders[i]);
995995

996996
// First check if the shader already has this as push constant
997997
bool AlreadyPushConstant = false;
@@ -1034,16 +1034,16 @@ void PipelineStateVkImpl::PatchShaderConvertUniformBufferToPushConstant(const Pu
10341034

10351035
if (ShouldPatchUniformBuffer)
10361036
{
1037-
const std::vector<uint32_t>& SPIRV = Stage.SPIRVs[i];
1037+
const std::vector<uint32_t>& SPIRV = Stage.SPIRVs[i];
10381038

1039-
std::vector<uint32_t> PatchedSPIRV = PatchSPIRVConvertUniformBufferToPushConstant(
1039+
std::vector<uint32_t> PatchedSPIRV = PatchSPIRVConvertUniformBufferToPushConstant(
10401040
SPIRV,
10411041
SPV_ENV_MAX, // Auto-detect target environment
10421042
PushConstantName);
10431043

10441044
if (!PatchedSPIRV.empty())
10451045
{
1046-
Stage.SPIRVs[i] = PatchedSPIRV;
1046+
Stage.SPIRVs[i] = PatchedSPIRV;
10471047
Stage.ShaderResources[i] = pShader->CreateSPIRVShaderResources(PatchedSPIRV);
10481048
}
10491049
else

0 commit comments

Comments
 (0)