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

Reduces allocations for ShaderDefines.

Browse Source 
It allows to reduce the number of allocations per-frame for
ShaderDefines. For example, on Acropolis Bay it goes down from
2.7k to 0.9k for the whole map view.
We don't really need std::vector for it. Because materials and
particularly shaders shouldn't have so many parameters.
This commit is contained in:
Vladislav Belov
2025-04-20 17:32:53 +02:00
parent 25ef6107e0
commit bdd3cac051
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/ShaderDefines.cpp
+13 -13
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2022 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -105,7 +105,7 @@ void CShaderParams<value_t>::Set(CStrIntern name, const value_t& value)
typename SItems::Item addedItem = std::make_pair(name, value);
// Add the new item in a way that preserves the sortedness and uniqueness of item names
for (typename std::vector<typename SItems::Item>::iterator it = items.items.begin(); ; ++it)
for (typename SItems::ItemsContainers::iterator it = items.items.begin(); ; ++it)
{
if (it == items.items.end() || addedItem.first < it->first)
{
@@ -143,8 +143,8 @@ template<typename value_t>
std::map<CStrIntern, value_t> CShaderParams<value_t>::GetMap() const
{
std::map<CStrIntern, value_t> ret;
for (size_t i = 0; i < m_Items->items.size(); ++i)
ret[m_Items->items[i].first] = m_Items->items[i].second;
for (const typename SItems::Item& item : m_Items->items)
ret[item.first] = item.second;
return ret;
}
@@ -158,10 +158,10 @@ template<typename value_t>
void CShaderParams<value_t>::SItems::RecalcHash()
{
size_t h = 0;
for (size_t i = 0; i < items.size(); ++i)
for (const Item& item : items)
{
hash_combine(h, items[i].first);
hash_combine(h, items[i].second);
hash_combine(h, item.first);
hash_combine(h, item.second);
}
hash = h;
}
@@ -175,12 +175,12 @@ void CShaderDefines::Add(CStrIntern name, CStrIntern value)
int CShaderDefines::GetInt(const char* name) const
{
CStrIntern nameIntern(name);
for (size_t i = 0; i < m_Items->items.size(); ++i)
for (const SItems::Item& item : m_Items->items)
{
if (m_Items->items[i].first == nameIntern)
if (item.first == nameIntern)
{
int ret;
std::stringstream str(m_Items->items[i].second.c_str());
std::stringstream str(item.second.c_str());
str >> ret;
return ret;
}
@@ -197,11 +197,11 @@ void CShaderUniforms::Add(const char* name, const CVector4D& value)
CVector4D CShaderUniforms::GetVector(const char* name) const
{
CStrIntern nameIntern(name);
for (size_t i = 0; i < m_Items->items.size(); ++i)
for (const SItems::Item& item : m_Items->items)
{
if (m_Items->items[i].first == nameIntern)
if (item.first == nameIntern)
{
return m_Items->items[i].second;
return item.second;
}
}
return CVector4D();
source/graphics/ShaderDefines.h
+7 -3
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2022 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,6 +18,7 @@
#ifndef INCLUDED_SHADERDEFINES
#define INCLUDED_SHADERDEFINES
#include "ps/containers/StaticVector.h"
#include "ps/CStr.h"
#include "ps/CStrIntern.h"
#include "renderer/backend/IDeviceCommandContext.h"
@@ -100,8 +101,11 @@ public:
// Name/value pair
using Item = std::pair<CStrIntern, value_t>;
// Sorted by name; no duplicated names
std::vector<Item> items;
// Sorted by name; no duplicated names. We can use the StaticVector
// because we shouldn't have too many shader parameters of a single
// type.
using ItemsContainers = PS::StaticVector<Item, 32>;
ItemsContainers items;
size_t hash;