OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

More pipeline lookup code

Browse source
This commit is contained in:
dpjudas 2025-04-06 02:11:38 +02:00
commit 8027f98eae
2 changed files with 51 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/common/rendering/vulkan/pipelines/vk_renderpass.cpp
View file

@ -376,6 +376,40 @@ std::unique_ptr<VulkanPipeline> VkRenderPassSetup::CreatePipeline(const VkPipeli
return CreateWithStats(builder);
}
VulkanPipeline* VkRenderPassSetup::GetVertexInputLibrary(int vertexFormat, bool useLevelMesh, int userUniformSize)
{
uint64_t key =
(static_cast<uint64_t>(vertexFormat)) |
(static_cast<uint64_t>(useLevelMesh) << 31) |
(static_cast<uint64_t>(userUniformSize) << 32);
auto& pipeline = Libraries.VertexInput[key];
if (!pipeline)
pipeline = CreateVertexInputLibrary(vertexFormat, useLevelMesh, userUniformSize);
return pipeline.get();
}
VulkanPipeline* VkRenderPassSetup::GetFragmentOutputLibrary(FRenderStyle renderStyle, VkColorComponentFlags colorMask)
{
uint64_t key = static_cast<uint64_t>(renderStyle.AsDWORD) | (static_cast<uint64_t>(colorMask) << 32);
auto& pipeline = Libraries.FragmentOutput[key];
if (!pipeline)
pipeline = CreateFragmentOutputLibrary(renderStyle, colorMask);
return pipeline.get();
}
VulkanPipeline* VkRenderPassSetup::GetVertexShaderLibrary(const VkPipelineKey& key, bool isUberShader)
{
// To do: look up pipeline
return nullptr;
}
VulkanPipeline* VkRenderPassSetup::GetFragmentShaderLibrary(const VkPipelineKey& key, bool isUberShader)
{
// To do: look up pipeline
return nullptr;
}
std::unique_ptr<VulkanPipeline> VkRenderPassSetup::LinkPipeline(const VkPipelineKey& key, bool isUberShader, UniformStructHolder& Uniforms)
{
VkShaderProgram* program = fb->GetShaderManager()->Get(key.ShaderKey, isUberShader);
@ -383,15 +417,12 @@ std::unique_ptr<VulkanPipeline> VkRenderPassSetup::LinkPipeline(const VkPipeline
Uniforms.Clear();
Uniforms = program->Uniforms;
// To do: look up these
std::unique_ptr<VulkanPipeline> vertexInput, vertexShader, fragmentShader, fragmentOutput;
GraphicsPipelineBuilder builder;
builder.Cache(fb->GetRenderPassManager()->GetCache());
builder.AddLibrary(vertexInput.get());
builder.AddLibrary(vertexShader.get());
builder.AddLibrary(fragmentShader.get());
builder.AddLibrary(fragmentOutput.get());
builder.AddLibrary(GetVertexInputLibrary(key.ShaderKey.VertexFormat, key.ShaderKey.Layout.UseLevelMesh, program->Uniforms.sz));
builder.AddLibrary(GetVertexShaderLibrary(key, isUberShader));
builder.AddLibrary(GetFragmentShaderLibrary(key, isUberShader));
builder.AddLibrary(GetFragmentOutputLibrary(key.RenderStyle, (VkColorComponentFlags)key.ColorMask));
return CreateWithStats(builder);
}

13
src/common/rendering/vulkan/pipelines/vk_renderpass.h
View file

@ -92,6 +92,11 @@ private:
std::unique_ptr<VulkanPipeline> LinkPipeline(const VkPipelineKey& key, bool isUberShader, UniformStructHolder& Uniforms);
std::unique_ptr<VulkanPipeline> CreateWithStats(GraphicsPipelineBuilder& builder);
VulkanPipeline* GetVertexInputLibrary(int vertexFormat, bool useLevelMesh, int userUniformSize);
VulkanPipeline* GetVertexShaderLibrary(const VkPipelineKey& key, bool isUberShader);
VulkanPipeline* GetFragmentShaderLibrary(const VkPipelineKey& key, bool isUberShader);
VulkanPipeline* GetFragmentOutputLibrary(FRenderStyle renderStyle, VkColorComponentFlags colorMask);
std::unique_ptr<VulkanPipeline> CreateVertexInputLibrary(int vertexFormat, bool useLevelMesh, int userUniformSize);
std::unique_ptr<VulkanPipeline> CreateVertexShaderLibrary(const VkPipelineKey& key, bool isUberShader);
std::unique_ptr<VulkanPipeline> CreateFragmentShaderLibrary(const VkPipelineKey& key, bool isUberShader);
@ -108,6 +113,14 @@ private:
std::unique_ptr<VulkanRenderPass> RenderPasses[8];
std::map<VkPipelineKey, PipelineData> GeneralizedPipelines;
std::map<VkPipelineKey, PipelineData> SpecializedPipelines;
struct
{
std::map<uint64_t, std::unique_ptr<VulkanPipeline>> VertexInput;
std::map<uint64_t, std::unique_ptr<VulkanPipeline>> VertexShader;
std::map<uint64_t, std::unique_ptr<VulkanPipeline>> FragmentShader;
std::map<uint64_t, std::unique_ptr<VulkanPipeline>> FragmentOutput;
} Libraries;
};
class VkVertexFormat