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: cb3e1bb2288fb54641b9c37aa834d86d16bfc6a7 [formerly d8cd853dd7e5aa4f3863dab42f3f68d65ef53ed7] [formerly 8f64028937689f0472e3febd94f189bc9e461c1e [formerly ac5f3bb11f52d985f1336a3a51d40fc9d24f3c59]]
Former-commit-id: 3bf5abc062b8d38241d829709d9867b40c140e84 [formerly e94c3d9f980d526b6a0dbf8dbe64e88eec0ba876]
Former-commit-id: c1dcb29cd3998e6eecd236bc86892fef240c4527
This commit is contained in:
Lynix 2016-08-10 23:12:22 +02:00
parent ded4d6c35d
commit c22fff6740
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);