mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moves all rendering to material passes

Browse Source 
Now we should use material passes instead of context and defines to
select a needed shader. It allows us to reduce the number of
shader combinations we use and reduce memory consumption.
This commit is contained in:
Vladislav Belov
2026-05-10 23:57:20 +02:00
parent aced56c336
commit 18a16aa135
11 changed files with 193 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/renderer/PatchRData.cpp
+20 -8
View File
@@ -883,7 +883,8 @@ using ShaderTechniqueBatches = PooledBatchMap<std::pair<CStrIntern, CShaderDefin
void CPatchRData::RenderBases(
Renderer::Backend::IDeviceCommandContext* deviceCommandContext,
Renderer::Backend::IVertexInputLayout* vertexInputLayout,
const std::vector<CPatchRData*>& patches, const CShaderDefines& context, ShadowMap* shadow)
const std::vector<CPatchRData*>& patches, const CShaderDefines& context,
ShadowMap* shadow, const CMaterial::Pass materialPass)
{
PROFILE3("render terrain bases");
GPU_SCOPED_LABEL(deviceCommandContext, "Render terrain bases");
@@ -902,7 +903,7 @@ void CPatchRData::RenderBases(
{
SSplat& splat = patch->m_Splats[j];
const CMaterial& material = splat.m_Texture->GetMaterial();
if (material.GetShaderEffect().empty())
if (material.GetShaderEffect(materialPass).empty())
{
LOGERROR("Terrain renderer failed to load shader effect.\n");
continue;
@@ -911,7 +912,9 @@ void CPatchRData::RenderBases(
BatchElements& batch = PooledPairGet(
PooledMapGet(
PooledMapGet(
PooledMapGet(batches, std::make_pair(material.GetShaderEffect(), material.GetShaderDefines()), scopedLinearAllocator),
PooledMapGet(
batches, std::make_pair(material.GetShaderEffect(materialPass), material.GetShaderDefines()),
scopedLinearAllocator),
splat.m_Texture, scopedLinearAllocator
),
patch->m_VBBase->m_Owner, scopedLinearAllocator
@@ -1043,7 +1046,8 @@ struct SBlendStackItem
void CPatchRData::RenderBlends(
Renderer::Backend::IDeviceCommandContext* deviceCommandContext,
Renderer::Backend::IVertexInputLayout* vertexInputLayout,
const std::vector<CPatchRData*>& patches, const CShaderDefines& context, ShadowMap* shadow)
const std::vector<CPatchRData*>& patches, const CShaderDefines& context,
ShadowMap* shadow, const CMaterial::Pass materialPass)
{
PROFILE3("render terrain blends");
GPU_SCOPED_LABEL(deviceCommandContext, "Render terrain blends");
@@ -1130,11 +1134,19 @@ void CPatchRData::RenderBlends(
CShaderDefines defines = contextBlend;
defines.SetMany(bestTex->GetMaterial().GetShaderDefines());
// TODO: move enabling blend to XML.
const CStrIntern shaderEffect = bestTex->GetMaterial().GetShaderEffect();
if (shaderEffect != str_terrain_base)
const CStrIntern shaderEffect = bestTex->GetMaterial().GetShaderEffect(materialPass);
if (shaderEffect != str_terrain_base && shaderEffect != str_terrain_base_reflections && shaderEffect != str_terrain_base_wireframe)
ONCE(LOGWARNING("Shader effect '%s' doesn't support semi-transparent terrain rendering.", shaderEffect.c_str()));
layer.m_ShaderTech = g_Renderer.GetShaderManager().LoadEffect(
shaderEffect == str_terrain_base ? str_terrain_blend : shaderEffect, defines);
layer.m_ShaderTech = g_Renderer.GetShaderManager().LoadEffect([](const CStrIntern shaderEffect)
{
if (shaderEffect == str_terrain_base)
return str_terrain_blend;
if (shaderEffect == str_terrain_base_reflections)
return str_terrain_blend_reflections;
if (shaderEffect == str_terrain_base_wireframe)
return str_terrain_blend_wireframe;
return shaderEffect;
}(shaderEffect), defines);
}
batches.push_back(layer);
}