PipelineStateBase: moved ExtractShaders methods to PipelineStateUtils

Author: TheMostDiligent

Graphics/Archiver/src/Archiver_D3D11.cpp

@@ -135,7 +135,7 @@ void SerializedPipelineStateImpl::PatchShadersD3D11(const CreateInfoType& Create
     std::vector<ShaderStageInfoD3D11> ShaderStages;
     SHADER_TYPE                       ActiveShaderStages    = SHADER_TYPE_UNKNOWN;
     constexpr bool                    WaitUntilShadersReady = true;
-    PipelineStateD3D11Impl::ExtractShaders<SerializedShaderImpl>(CreateInfo, ShaderStages, WaitUntilShadersReady, ActiveShaderStages);
+    PipelineStateUtils::ExtractShaders<SerializedShaderImpl>(CreateInfo, ShaderStages, WaitUntilShadersReady, ActiveShaderStages);
 
     std::vector<ShaderD3D11Impl*> ShadersD3D11{ShaderStages.size()};
     for (size_t i = 0; i < ShadersD3D11.size(); ++i)

Graphics/Archiver/src/Archiver_D3D12.cpp

@@ -115,7 +115,7 @@ void SerializedPipelineStateImpl::PatchShadersD3D12(const CreateInfoType& Create
     std::vector<ShaderStageInfoD3D12> ShaderStages;
     SHADER_TYPE                       ActiveShaderStages    = SHADER_TYPE_UNKNOWN;
     constexpr bool                    WaitUntilShadersReady = true;
-    PipelineStateD3D12Impl::ExtractShaders<SerializedShaderImpl>(CreateInfo, ShaderStages, WaitUntilShadersReady, ActiveShaderStages);
+    PipelineStateUtils::ExtractShaders<SerializedShaderImpl>(CreateInfo, ShaderStages, WaitUntilShadersReady, ActiveShaderStages);
 
     PipelineStateD3D12Impl::TShaderStages ShaderStagesD3D12{ShaderStages.size()};
     for (size_t i = 0; i < ShaderStagesD3D12.size(); ++i)
@@ -236,7 +236,7 @@ void SerializedPipelineStateImpl::ExtractShadersD3D12(const RayTracingPipelineSt
     std::vector<ShaderStageInfoD3D12> ShaderStages;
     SHADER_TYPE                       ActiveShaderStages    = SHADER_TYPE_UNKNOWN;
     constexpr bool                    WaitUntilShadersReady = true;
-    PipelineStateD3D12Impl::ExtractShaders<SerializedShaderImpl>(CreateInfo, ShaderStages, WaitUntilShadersReady, ActiveShaderStages);
+    PipelineStateUtils::ExtractShaders<SerializedShaderImpl>(CreateInfo, ShaderStages, WaitUntilShadersReady, ActiveShaderStages);
 
     GetRayTracingShaderMap(ShaderStages, ShaderMap);
 }

Graphics/Archiver/src/Archiver_GL.cpp

@@ -463,7 +463,7 @@ void SerializedPipelineStateImpl::PatchShadersGL(const CreateInfoType& CreateInf
     std::vector<ShaderStageInfoGL> ShaderStages;
     SHADER_TYPE                    ActiveShaderStages    = SHADER_TYPE_UNKNOWN;
     constexpr bool                 WaitUntilShadersReady = true;
-    PipelineStateGLImpl::ExtractShaders<SerializedShaderImpl>(CreateInfo, ShaderStages, WaitUntilShadersReady, ActiveShaderStages);
+    PipelineStateUtils::ExtractShaders<SerializedShaderImpl>(CreateInfo, ShaderStages, WaitUntilShadersReady, ActiveShaderStages);
 
     VERIFY_EXPR(m_Data.Shaders[static_cast<size_t>(DeviceType::OpenGL)].empty());
     for (size_t i = 0; i < ShaderStages.size(); ++i)

Graphics/Archiver/src/Archiver_Mtl.mm

@@ -494,7 +494,7 @@ Uint32 GetSubpassIndex(const GraphicsPipelineStateCreateInfo& CI)
     std::vector<ShaderStageInfoMtl> ShaderStages;
     SHADER_TYPE                     ActiveShaderStages    = SHADER_TYPE_UNKNOWN;
     constexpr bool                  WaitUntilShadersReady = true;
-    PipelineStateMtlImpl::ExtractShaders<SerializedShaderImpl>(CreateInfo, ShaderStages, WaitUntilShadersReady, ActiveShaderStages);
+    PipelineStateUtils::ExtractShaders<SerializedShaderImpl>(CreateInfo, ShaderStages, WaitUntilShadersReady, ActiveShaderStages);
 
     std::vector<const ParsedMSLInfo*> StageResources{ShaderStages.size()};
     for (size_t i = 0; i < StageResources.size(); ++i)

Graphics/Archiver/src/Archiver_Vk.cpp

@@ -116,7 +116,7 @@ void SerializedPipelineStateImpl::PatchShadersVk(const CreateInfoType& CreateInf
     std::vector<ShaderStageInfoVk> ShaderStages;
     SHADER_TYPE                    ActiveShaderStages    = SHADER_TYPE_UNKNOWN;
     constexpr bool                 WaitUntilShadersReady = true;
-    PipelineStateVkImpl::ExtractShaders<SerializedShaderImpl>(CreateInfo, ShaderStages, WaitUntilShadersReady, ActiveShaderStages);
+    PipelineStateUtils::ExtractShaders<SerializedShaderImpl>(CreateInfo, ShaderStages, WaitUntilShadersReady, ActiveShaderStages);
 
     PipelineStateVkImpl::TShaderStages ShaderStagesVk{ShaderStages.size()};
     for (size_t i = 0; i < ShaderStagesVk.size(); ++i)
@@ -263,7 +263,7 @@ void SerializedPipelineStateImpl::ExtractShadersVk(const RayTracingPipelineState
     std::vector<ShaderStageInfoVk> ShaderStages;
     SHADER_TYPE                    ActiveShaderStages    = SHADER_TYPE_UNKNOWN;
     constexpr bool                 WaitUntilShadersReady = true;
-    PipelineStateVkImpl::ExtractShaders<SerializedShaderImpl>(CreateInfo, ShaderStages, WaitUntilShadersReady, ActiveShaderStages);
+    PipelineStateUtils::ExtractShaders<SerializedShaderImpl>(CreateInfo, ShaderStages, WaitUntilShadersReady, ActiveShaderStages);
 
     GetRayTracingShaderMap(ShaderStages, ShaderMap);
 }

Graphics/Archiver/src/Archiver_WebGPU.cpp

@@ -131,7 +131,7 @@ void SerializedPipelineStateImpl::PatchShadersWebGPU(const CreateInfoType& Creat
     std::vector<ShaderStageInfoWebGPU> ShaderStages;
     SHADER_TYPE                        ActiveShaderStages    = SHADER_TYPE_UNKNOWN;
     constexpr bool                     WaitUntilShadersReady = true;
-    PipelineStateWebGPUImpl::ExtractShaders<SerializedShaderImpl>(CreateInfo, ShaderStages, WaitUntilShadersReady, ActiveShaderStages);
+    PipelineStateUtils::ExtractShaders<SerializedShaderImpl>(CreateInfo, ShaderStages, WaitUntilShadersReady, ActiveShaderStages);
 
     PipelineStateWebGPUImpl::TShaderStages ShaderStagesWebGPU;
     ShaderStagesWebGPU.reserve(ShaderStages.size());