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

Fix conditional defines to not construct new CShaderDefines frequently

Browse Source 
CShaderDefines is designed to be efficient to copy and compare, but not
to construct. Conditional defines were constructing new CShaderDefines
for many models every frame.

Precompute all the possible conditional combinations of CShaderDefines
when a material is first loaded, so they can be looked up at no cost
when rendering.

This was SVN commit r13902.
This commit is contained in:
Ykkrosh
2013-09-29 00:30:58 +00:00
parent 22f0f2b232
commit 555deea136
6 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/Material.cpp
+30 -1
View File
@@ -35,11 +35,13 @@ void CMaterial::SetShaderEffect(const CStr& effect)
void CMaterial::AddShaderDefine(const char* key, const char* value)
{
m_ShaderDefines.Add(key, value);
m_CombinedShaderDefines.clear();
}
void CMaterial::AddConditionalDefine(const char* defname, const char* defvalue, int type, std::vector<float> &args)
{
m_ConditionalDefines.Add(defname, defvalue, type, args);
m_CombinedShaderDefines.clear();
}
void CMaterial::AddStaticUniform(const char* key, const CVector4D& value)
@@ -57,4 +59,31 @@ void CMaterial::AddSampler(const TextureSampler& texture)
void CMaterial::AddRenderQuery(const char* key)
{
m_RenderQueries.Add(key);
}
}
// Set up m_CombinedShaderDefines so that index i contains m_ShaderDefines, plus
// the extra defines from m_ConditionalDefines[j] for all j where bit j is set in i.
// This lets GetShaderDefines() cheaply return the defines for any combination of conditions.
//
// (This might scale badly if we had a large number of conditional defines per material,
// but currently we don't expect to have many.)
void CMaterial::RecomputeCombinedShaderDefines()
{
m_CombinedShaderDefines.clear();
int size = m_ConditionalDefines.GetSize();
// Loop over all 2^n combinations of flags
for (int i = 0; i < (1 << size); i++)
{
CShaderDefines defs = m_ShaderDefines;
for (int j = 0; j < size; j++)
{
if (i & (1 << j))
{
CShaderConditionalDefines::CondDefine& def = m_ConditionalDefines.GetItem(j);
defs.Add(def.m_DefName.c_str(), def.m_DefValue.c_str());
}
}
m_CombinedShaderDefines.push_back(defs);
}
}