From 6e89d34c9d9d567bcaf0dc2d88ce584cbf24e5cf Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Wed, 10 Aug 2016 23:17:25 +0200
Subject: [PATCH] Ditto

Former-commit-id: f365cc8672d2eab20f121cf9ab10da5caec8a970 [formerly 24946be5b1045755d9d9d0bee0496feb7c58ff27] [formerly 7a3e46294df8577d38074589aabdc1786a46ee07 [formerly 9f97ef85ec4e440da265b2501d1423a986f033ee]]
Former-commit-id: 69a61ef34ec687d786e6c5bbc40fb27b20960c21 [formerly fd94316370437cd7ed97778772b20e1cb1fa4249]
Former-commit-id: e0f6c22e3dfd0a3ff88c7fdf1f746db7f0fafbf5
---
 include/Nazara/Renderer/RenderStates.inl | 72 ++++++++++++------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/include/Nazara/Renderer/RenderStates.inl b/include/Nazara/Renderer/RenderStates.inl
index 9b7c1be62..525491162 100644
--- a/include/Nazara/Renderer/RenderStates.inl
+++ b/include/Nazara/Renderer/RenderStates.inl
@@ -81,59 +81,59 @@ namespace std
 			Nz::UInt8 parameterHash = 0;
 			Nz::UInt8 parameterIndex = 0;
 
-			#define NazaraRenderStateMember(member) Nz::HashCombine(seed, pipelineInfo.member)
-			#define NazaraRenderStateBoolMember(member) parameterHash |= ((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 NazaraRenderStateBool(member) parameterHash |= ((pipelineInfo.member) ? 1U : 0U) << (parameterIndex++)
+			#define NazaraRenderStateBoolDep(dependency, member) parameterHash |= ((pipelineInfo.dependency && pipelineInfo.member) ? 1U : 0U) << (parameterIndex++)
+			#define NazaraRenderStateEnum(member) Nz::HashCombine(seed, static_cast<Nz::UInt8>(pipelineInfo.member))
+			#define NazaraRenderStateFloat(member, maxDiff) Nz::HashCombine(seed, std::floor(pipelineInfo.member / maxDiff) * maxDiff)
 
-			NazaraRenderStateBoolMember(blending);
-			NazaraRenderStateBoolMember(colorWrite);
-			NazaraRenderStateBoolMember(depthBuffer);
-			NazaraRenderStateBoolMember(faceCulling);
-			NazaraRenderStateBoolMember(scissorTest);
-			NazaraRenderStateBoolMember(stencilTest);
+			NazaraRenderStateBool(blending);
+			NazaraRenderStateBool(colorWrite);
+			NazaraRenderStateBool(depthBuffer);
+			NazaraRenderStateBool(faceCulling);
+			NazaraRenderStateBool(scissorTest);
+			NazaraRenderStateBool(stencilTest);
 
-			NazaraRenderStateBoolMemberDep(depthBuffer, depthWrite);
+			NazaraRenderStateBoolDep(depthBuffer, depthWrite);
 
-			NazaraRenderStateMember(faceFilling);
+			NazaraRenderStateEnum(faceFilling);
 
 			if (pipelineInfo.blending) //< Remember, at this time we know lhs.blending == rhs.blending
 			{
-				NazaraRenderStateMember(dstBlend);
-				NazaraRenderStateMember(srcBlend);
+				NazaraRenderStateEnum(dstBlend);
+				NazaraRenderStateEnum(srcBlend);
 			}
 
 			if (pipelineInfo.depthBuffer)
-				NazaraRenderStateMember(depthFunc);
+				NazaraRenderStateEnum(depthFunc);
 
 			if (pipelineInfo.faceCulling)
-				NazaraRenderStateMember(cullingSide);
+				NazaraRenderStateEnum(cullingSide);
 
 			if (pipelineInfo.stencilTest)
 			{
-				NazaraRenderStateMember(stencilCompare.back);
-				NazaraRenderStateMember(stencilCompare.front);
-				NazaraRenderStateMember(stencilCompareMask.back);
-				NazaraRenderStateMember(stencilCompareMask.front);
-				NazaraRenderStateMember(stencilDepthFail.back);
-				NazaraRenderStateMember(stencilDepthFail.front);
-				NazaraRenderStateMember(stencilFail.back);
-				NazaraRenderStateMember(stencilFail.front);
-				NazaraRenderStateMember(stencilPass.back);
-				NazaraRenderStateMember(stencilPass.front);
-				NazaraRenderStateMember(stencilReference.back);
-				NazaraRenderStateMember(stencilReference.front);
-				NazaraRenderStateMember(stencilWriteMask.back);
-				NazaraRenderStateMember(stencilWriteMask.front);
+				NazaraRenderStateEnum(stencilCompare.back);
+				NazaraRenderStateEnum(stencilCompare.front);
+				NazaraRenderStateEnum(stencilCompareMask.back);
+				NazaraRenderStateEnum(stencilCompareMask.front);
+				NazaraRenderStateEnum(stencilDepthFail.back);
+				NazaraRenderStateEnum(stencilDepthFail.front);
+				NazaraRenderStateEnum(stencilFail.back);
+				NazaraRenderStateEnum(stencilFail.front);
+				NazaraRenderStateEnum(stencilPass.back);
+				NazaraRenderStateEnum(stencilPass.front);
+				NazaraRenderStateEnum(stencilReference.back);
+				NazaraRenderStateEnum(stencilReference.front);
+				NazaraRenderStateEnum(stencilWriteMask.back);
+				NazaraRenderStateEnum(stencilWriteMask.front);
 			}
 
-			NazaraRenderStateFloatMember(lineWidth, 0.001f);
-			NazaraRenderStateFloatMember(pointSize, 0.001f);
+			NazaraRenderStateFloat(lineWidth, 0.001f);
+			NazaraRenderStateFloat(pointSize, 0.001f);
 
-			#undef NazaraRenderStateMember
-			#undef NazaraRenderStateBoolMember
-			#undef NazaraRenderStateBoolMemberDep
-			#undef NazaraRenderStateFloatMember
+			#undef NazaraRenderStateBool
+			#undef NazaraRenderStateBoolDep
+			#undef NazaraRenderStateEnum
+			#undef NazaraRenderStateFloat
 
 			Nz::HashCombine(seed, parameterHash);