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

Renderer/RenderStates: Fix compilation with GCC/Clang 

Former-commit-id: 802d2d15fc5c1d7f5a350ce18e1c105cdb001b5f [formerly 76d7c26fba7510d64aadbac3b142a699afdfad16] [formerly a1ec278f7404f5bd1ecad4e0c3c511bdf638e67e [formerly 0f98c7716944aad42b0c5ac58af360526757dc2f]]
Former-commit-id: 118f5cf639bb5f7fc0330519a9e8e464203859b5 [formerly 96bcd9ce1d3e4f43dc4ffc0389de27e6bd66ca71]
Former-commit-id: 94a2d27a97be7040287bedee2c8c3695a021115e
This commit is contained in:
Lynix 2016-08-10 23:12:22 +02:00
parent 279597b675
commit e6fc3edeca
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/Nazara/Renderer/RenderStates.inl
View File

@ -12,9 +12,9 @@ namespace Nz
{ {
bool operator==(const RenderStates& lhs, const RenderStates& rhs) bool operator==(const RenderStates& lhs, const RenderStates& rhs)
{ {
#define NazaraRenderStateMember(field) if (lhs.##field != rhs.##field) return false #define NazaraRenderStateMember(field) if (lhs.field != rhs.field) return false
#define NazaraRenderStateBoolMember NazaraRenderStateMember #define NazaraRenderStateBoolMember NazaraRenderStateMember
#define NazaraRenderStateFloatMember(field, maxDiff) if (!NumberEquals(lhs.##field, rhs.##field, maxDiff)) return false #define NazaraRenderStateFloatMember(field, maxDiff) if (!NumberEquals(lhs.field, rhs.field, maxDiff)) return false
NazaraRenderStateBoolMember(blending); NazaraRenderStateBoolMember(blending);
NazaraRenderStateBoolMember(colorWrite); NazaraRenderStateBoolMember(colorWrite);
@ -81,10 +81,10 @@ namespace std
Nz::UInt8 parameterHash = 0; Nz::UInt8 parameterHash = 0;
Nz::UInt8 parameterIndex = 0; Nz::UInt8 parameterIndex = 0;
#define NazaraRenderStateMember(member) Nz::HashCombine(seed, pipelineInfo.##member) #define NazaraRenderStateMember(member) Nz::HashCombine(seed, pipelineInfo.member)
#define NazaraRenderStateBoolMember(member) parameterHash |= ((pipelineInfo.##member) ? 1U : 0U) << (parameterIndex++) #define NazaraRenderStateBoolMember(member) parameterHash |= ((pipelineInfo.member) ? 1U : 0U) << (parameterIndex++)
#define NazaraRenderStateBoolMemberDep(dependency, member) parameterHash |= ((pipelineInfo.##dependency && pipelineInfo.##member) ? 1U : 0U) << (parameterIndex++) #define NazaraRenderStateBoolMemberDep(dependency, member) parameterHash |= ((pipelineInfo.dependency && pipelineInfo.member) ? 1U : 0U) << (parameterIndex++)
#define NazaraRenderStateFloatMember(member, maxDiff) Nz::HashCombine(seed, std::floor(pipelineInfo.##member / maxDiff) * maxDiff) #define NazaraRenderStateFloatMember(member, maxDiff) Nz::HashCombine(seed, std::floor(pipelineInfo.member / maxDiff) * maxDiff)
NazaraRenderStateBoolMember(blending); NazaraRenderStateBoolMember(blending);
NazaraRenderStateBoolMember(colorWrite); NazaraRenderStateBoolMember(colorWrite);