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

4
include/Nazara/Graphics/MaterialPipeline.inl
View File

@@ -40,7 +40,7 @@ namespace Nz
for (std::size_t i = 0; i < lhs.shaders.size(); ++i)
{
if (lhs.shaders[i].enabledConditions != rhs.shaders[i].enabledConditions)
if (lhs.shaders[i].enabledOptions != rhs.shaders[i].enabledOptions)
return false;
if (lhs.shaders[i].uberShader != rhs.shaders[i].uberShader)
@@ -85,7 +85,7 @@ namespace std
for (const auto& shader : pipelineInfo.shaders)
{
Nz::HashCombine(seed, shader.enabledConditions);
Nz::HashCombine(seed, shader.enabledOptions);
Nz::HashCombine(seed, shader.uberShader.get());
}