sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Graphics: rework ubershaders to prevent duplicate shaders modules

Browse Source 
Also rename all remaining conditions to options
This commit is contained in:
Jérôme Leclercq
2021-07-08 14:52:39 +02:00
parent 9ab47edd11
commit a895e553d4
38 changed files with 524 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Graphics/BasicMaterial.hpp
View File

@@ -56,7 +56,7 @@ namespace Nz
};
private:
struct ConditionIndexes
struct OptionIndexes
{
std::size_t alphaTest;
std::size_t hasAlphaMap;
@@ -74,13 +74,13 @@ namespace Nz
Material& m_material;
std::size_t m_uniformBlockIndex;
ConditionIndexes m_conditionIndexes;
OptionIndexes m_optionIndexes;
TextureIndexes m_textureIndexes;
UniformOffsets m_uniformOffsets;
static std::shared_ptr<MaterialSettings> s_materialSettings;
static std::size_t s_uniformBlockIndex;
static ConditionIndexes s_conditionIndexes;
static OptionIndexes s_optionIndexes;
static TextureIndexes s_textureIndexes;
static UniformOffsets s_uniformOffsets;
};