real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions 2 Activity

Fix unnecessary CShaderConditionalDefines copy, and inline some functions

Browse Source 
This was SVN commit r13904.
This commit is contained in:
Ykkrosh 2013-09-29 02:05:02 +00:00
parent f075571502
commit 4e9570cd0f
4 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/graphics/Material.cpp
View File

@ -80,7 +80,7 @@ void CMaterial::RecomputeCombinedShaderDefines()
{
if (i & (1 << j))
{
CShaderConditionalDefines::CondDefine& def = m_ConditionalDefines.GetItem(j);
const CShaderConditionalDefines::CondDefine& def = m_ConditionalDefines.GetItem(j);
defs.Add(def.m_DefName.c_str(), def.m_DefValue.c_str());
}
}

20
source/graphics/ShaderDefines.cpp
View File

@ -250,16 +250,6 @@ void CShaderRenderQueries::Add(const char* name)
}
}
size_t CShaderRenderQueries::GetSize()
{
return m_Items.size();
}
CShaderRenderQueries::RenderQuery CShaderRenderQueries::GetItem(size_t i)
{
return m_Items[i];
}
void CShaderConditionalDefines::Add(const char* defname, const char* defvalue, int type, std::vector<float> &args)
{
CondDefine cd;
@ -271,16 +261,6 @@ void CShaderConditionalDefines::Add(const char* defname, const char* defvalue, i
m_Defines.push_back(cd);
}
size_t CShaderConditionalDefines::GetSize()
{
return m_Defines.size();
}
CShaderConditionalDefines::CondDefine& CShaderConditionalDefines::GetItem(size_t i)
{
return m_Defines[i];
}
// Explicit instantiations:

8
source/graphics/ShaderDefines.h
View File

@ -186,8 +186,8 @@ public:
typedef std::pair<int, CStrIntern> RenderQuery;
void Add(const char* name);
size_t GetSize();
RenderQuery GetItem(size_t i);
size_t GetSize() const { return m_Items.size(); }
RenderQuery GetItem(size_t i) const { return m_Items[i]; }
private:
std::vector<RenderQuery> m_Items;
};
@ -210,8 +210,8 @@ public:
};
void Add(const char* defname, const char* defvalue, int type, std::vector<float> &args);
size_t GetSize();
CondDefine& GetItem(size_t i);
size_t GetSize() const { return m_Defines.size(); }
const CondDefine& GetItem(size_t i) const { return m_Defines[i]; }
private:
std::vector<CondDefine> m_Defines;

4
source/renderer/ModelRenderer.cpp
View File

@ -429,10 +429,10 @@ void ShaderModelRenderer::Render(const RenderModifierPtr& modifier, const CShade
uint32_t condFlags = 0;
CShaderConditionalDefines condefs = model->GetMaterial().GetConditionalDefines();
const CShaderConditionalDefines& condefs = model->GetMaterial().GetConditionalDefines();
for (size_t j = 0; j < condefs.GetSize(); ++j)
{
CShaderConditionalDefines::CondDefine &item = condefs.GetItem(j);
const CShaderConditionalDefines::CondDefine &item = condefs.GetItem(j);
int type = item.m_CondType;
switch (type)
{