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

Fix Graphics module compilation

This commit is contained in:
Jérôme Leclercq 2021-04-17 19:15:48 +02:00
parent 0cc392b78f
commit f85d11e55b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nazara/Graphics/BasicMaterial.cpp
View File

@ -176,7 +176,7 @@ namespace Nz
{ {
std::array<UInt64, ShaderStageTypeCount> shaderConditions; std::array<UInt64, ShaderStageTypeCount> shaderConditions;
shaderConditions.fill(0); shaderConditions.fill(0);
shaderConditions[UnderlyingCast(ShaderStageType::Fragment)] = fragmentShader->GetConditionFlagByName("HAS_DIFFUSE_TEXTURE"); shaderConditions[UnderlyingCast(ShaderStageType::Fragment)] = fragmentShader->GetOptionFlagByName("HAS_DIFFUSE_TEXTURE");
s_conditionIndexes.hasDiffuseMap = settings.conditions.size(); s_conditionIndexes.hasDiffuseMap = settings.conditions.size();
settings.conditions.push_back({ settings.conditions.push_back({
@ -189,7 +189,7 @@ namespace Nz
{ {
std::array<UInt64, ShaderStageTypeCount> shaderConditions; std::array<UInt64, ShaderStageTypeCount> shaderConditions;
shaderConditions.fill(0); shaderConditions.fill(0);
shaderConditions[UnderlyingCast(ShaderStageType::Fragment)] = fragmentShader->GetConditionFlagByName("HAS_ALPHA_TEXTURE"); shaderConditions[UnderlyingCast(ShaderStageType::Fragment)] = fragmentShader->GetOptionFlagByName("HAS_ALPHA_TEXTURE");
s_conditionIndexes.hasAlphaMap = settings.conditions.size(); s_conditionIndexes.hasAlphaMap = settings.conditions.size();
settings.conditions.push_back({ settings.conditions.push_back({
@ -202,7 +202,7 @@ namespace Nz
{ {
std::array<UInt64, ShaderStageTypeCount> shaderConditions; std::array<UInt64, ShaderStageTypeCount> shaderConditions;
shaderConditions.fill(0); shaderConditions.fill(0);
shaderConditions[UnderlyingCast(ShaderStageType::Fragment)] = fragmentShader->GetConditionFlagByName("ALPHA_TEST"); shaderConditions[UnderlyingCast(ShaderStageType::Fragment)] = fragmentShader->GetOptionFlagByName("ALPHA_TEST");
s_conditionIndexes.alphaTest = settings.conditions.size(); s_conditionIndexes.alphaTest = settings.conditions.size();
settings.conditions.push_back({ settings.conditions.push_back({