diff --git a/include/Nazara/Renderer/Enums.hpp b/include/Nazara/Renderer/Enums.hpp index 4d1198391..fc9ac1464 100644 --- a/include/Nazara/Renderer/Enums.hpp +++ b/include/Nazara/Renderer/Enums.hpp @@ -123,13 +123,13 @@ enum nzRendererCap nzRendererCap_Max = nzRendererCap_TextureNPOT }; -enum nzRendererClearFlags +enum nzRendererBufferFlags { - nzRendererClear_Color = 0x1, - nzRendererClear_Depth = 0x2, - nzRendererClear_Stencil = 0x4, + nzRendererBuffer_Color = 0x1, + nzRendererBuffer_Depth = 0x2, + nzRendererBuffer_Stencil = 0x4, - nzRendererClear_Max = nzRendererClear_Stencil*2-1 + nzRendererBuffer_Max = nzRendererBuffer_Stencil*2-1 }; enum nzRendererComparison diff --git a/include/Nazara/Renderer/Renderer.hpp b/include/Nazara/Renderer/Renderer.hpp index 3788706dc..feafc5c10 100644 --- a/include/Nazara/Renderer/Renderer.hpp +++ b/include/Nazara/Renderer/Renderer.hpp @@ -38,7 +38,7 @@ class NAZARA_API NzRenderer static void BeginCondition(const NzGpuQuery& query, nzGpuQueryCondition condition); - static void Clear(nzUInt32 flags = nzRendererClear_Color | nzRendererClear_Depth); + static void Clear(nzUInt32 flags = nzRendererBuffer_Color | nzRendererBuffer_Depth); static void DrawFullscreenQuad(); static void DrawIndexedPrimitives(nzPrimitiveMode mode, unsigned int firstIndex, unsigned int indexCount); diff --git a/src/Nazara/Graphics/DeferredPhongLightingPass.cpp b/src/Nazara/Graphics/DeferredPhongLightingPass.cpp index db3fa5b58..0ab1410e9 100644 --- a/src/Nazara/Graphics/DeferredPhongLightingPass.cpp +++ b/src/Nazara/Graphics/DeferredPhongLightingPass.cpp @@ -209,7 +209,7 @@ bool NzDeferredPhongLightingPass::Process(const NzScene* scene, unsigned int fir NzRenderer::SetTextureSampler(2, m_pointSampler); NzRenderer::SetClearColor(NzColor::Black); - NzRenderer::Clear(nzRendererClear_Color); + NzRenderer::Clear(nzRendererBuffer_Color); NzRenderStates lightStates; lightStates.dstBlend = nzBlendFunc_One; diff --git a/src/Nazara/Graphics/ForwardRenderTechnique.cpp b/src/Nazara/Graphics/ForwardRenderTechnique.cpp index 8d9a4b4db..6b2708730 100644 --- a/src/Nazara/Graphics/ForwardRenderTechnique.cpp +++ b/src/Nazara/Graphics/ForwardRenderTechnique.cpp @@ -67,7 +67,7 @@ void NzForwardRenderTechnique::Clear(const NzScene* scene) const { NzRenderer::Enable(nzRendererParameter_DepthBuffer, true); NzRenderer::Enable(nzRendererParameter_DepthWrite, true); - NzRenderer::Clear(nzRendererClear_Depth); + NzRenderer::Clear(nzRendererBuffer_Depth); NzAbstractBackground* background = scene->GetBackground(); if (background) diff --git a/src/Nazara/Renderer/Renderer.cpp b/src/Nazara/Renderer/Renderer.cpp index c2c735e37..477cb06b6 100644 --- a/src/Nazara/Renderer/Renderer.cpp +++ b/src/Nazara/Renderer/Renderer.cpp @@ -220,13 +220,13 @@ void NzRenderer::Clear(nzUInt32 flags) GLenum mask = 0; - if (flags & nzRendererClear_Color) + if (flags & nzRendererBuffer_Color) mask |= GL_COLOR_BUFFER_BIT; - if (flags & nzRendererClear_Depth) + if (flags & nzRendererBuffer_Depth) mask |= GL_DEPTH_BUFFER_BIT; - if (flags & nzRendererClear_Stencil) + if (flags & nzRendererBuffer_Stencil) mask |= GL_STENCIL_BUFFER_BIT; glClear(mask);