gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Adds compute shaders support and scaling with FSR.

Browse Source 
Fixes #6842

Comments By: phosit, Stan
Differential Revision: https://code.wildfiregames.com/D5218
This was SVN commit r28010.
This commit is contained in:
vladislavbelov
2024-01-17 19:40:27 +00:00
parent f9f798158a
commit e3f46bb809
63 changed files with 5337 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/ShaderManager.cpp
+28 -5
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2023 Wildfire Games.
/* Copyright (C) 2024 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -173,6 +173,7 @@ bool CShaderManager::LoadTechnique(CShaderTechniquePtr& tech)
#define AT(x) int at_##x = XeroFile.GetAttributeID(#x)
EL(blend);
EL(color);
EL(compute);
EL(cull);
EL(define);
EL(depth);
@@ -269,6 +270,17 @@ bool CShaderManager::LoadTechnique(CShaderTechniquePtr& tech)
tech->SetSortByDistance(false);
const auto loadShaderProgramForTech = [&](const CStr& name, const CShaderDefines& defines)
{
CShaderProgramPtr shaderProgram = LoadProgram(name.c_str(), defines);
if (shaderProgram)
{
for (const VfsPath& shaderProgramPath : shaderProgram->GetFileDependencies())
AddTechniqueFileDependency(tech, shaderProgramPath);
}
return shaderProgram;
};
CShaderDefines techDefines = tech->GetShaderDefines();
XERO_ITER_EL((*usableTech), Child)
{
@@ -430,11 +442,9 @@ bool CShaderManager::LoadTechnique(CShaderTechniquePtr& tech)
// Load the shader program after we've read all the possibly-relevant <define>s.
CShaderProgramPtr shaderProgram =
LoadProgram(Child.GetAttributes().GetNamedItem(at_shader).c_str(), passDefines);
loadShaderProgramForTech(Child.GetAttributes().GetNamedItem(at_shader), passDefines);
if (shaderProgram)
{
for (const VfsPath& shaderProgramPath : shaderProgram->GetFileDependencies())
AddTechniqueFileDependency(tech, shaderProgramPath);
if (tech->GetPipelineStateDescCallback())
tech->GetPipelineStateDescCallback()(passPipelineStateDesc);
passPipelineStateDesc.shaderProgram = shaderProgram->GetBackendShaderProgram();
@@ -442,9 +452,22 @@ bool CShaderManager::LoadTechnique(CShaderTechniquePtr& tech)
m_Device->CreateGraphicsPipelineState(passPipelineStateDesc), shaderProgram);
}
}
else if (Child.GetNodeName() == el_compute)
{
CShaderProgramPtr shaderProgram =
loadShaderProgramForTech(Child.GetAttributes().GetNamedItem(at_shader), techDefines);
if (shaderProgram)
{
Renderer::Backend::SComputePipelineStateDesc computePipelineStateDesc{};
computePipelineStateDesc.shaderProgram = shaderProgram->GetBackendShaderProgram();
tech->SetComputePipelineState(
m_Device->CreateComputePipelineState(computePipelineStateDesc), shaderProgram);
}
}
}
tech->SetPasses(std::move(techPasses));
if (!techPasses.empty())
tech->SetPasses(std::move(techPasses));
return true;
}