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

Renderer::Clear now takes UInt32 instead of unsigned long 

Former-commit-id: ea276bb13e4d5334422eb685ec1a9d908d6f9895
This commit is contained in:
Lynix 2013-08-18 21:00:04 +02:00
parent e31a670041
commit f73c99d502
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/Nazara/Renderer/Renderer.hpp
View File

@ -31,7 +31,7 @@ class NAZARA_API NzRenderer
NzRenderer() = delete; NzRenderer() = delete;
~NzRenderer() = delete; ~NzRenderer() = delete;
static void Clear(unsigned long flags = nzRendererClear_Color | nzRendererClear_Depth); static void Clear(nzUInt32 flags = nzRendererClear_Color | nzRendererClear_Depth);
static void DrawFullscreenQuad(); static void DrawFullscreenQuad();
static void DrawIndexedPrimitives(nzPrimitiveMode mode, unsigned int firstIndex, unsigned int indexCount); static void DrawIndexedPrimitives(nzPrimitiveMode mode, unsigned int firstIndex, unsigned int indexCount);
@ -41,7 +41,6 @@ class NAZARA_API NzRenderer
static void Enable(nzRendererParameter parameter, bool enable); static void Enable(nzRendererParameter parameter, bool enable);
static void Flush(); static void Flush();
static NzVertexBuffer* GetInstanceBuffer(); static NzVertexBuffer* GetInstanceBuffer();

8
src/Nazara/Renderer/Renderer.cpp
View File

@ -91,7 +91,7 @@ namespace
unsigned int s_maxVertexAttribs; unsigned int s_maxVertexAttribs;
} }
void NzRenderer::Clear(unsigned long flags) void NzRenderer::Clear(nzUInt32 flags)
{ {
#ifdef NAZARA_DEBUG #ifdef NAZARA_DEBUG
if (NzContext::GetCurrent() == nullptr) if (NzContext::GetCurrent() == nullptr)
@ -103,6 +103,9 @@ void NzRenderer::Clear(unsigned long flags)
if (flags) if (flags)
{ {
// Les états du rendu sont suceptibles d'influencer glClear
NzOpenGL::ApplyStates(s_states);
GLenum mask = 0; GLenum mask = 0;
if (flags & nzRendererClear_Color) if (flags & nzRendererClear_Color)
@ -114,9 +117,6 @@ void NzRenderer::Clear(unsigned long flags)
if (flags & nzRendererClear_Stencil) if (flags & nzRendererClear_Stencil)
mask |= GL_STENCIL_BUFFER_BIT; mask |= GL_STENCIL_BUFFER_BIT;
// Les états du rendu sont suceptibles d'influencer glClear
NzOpenGL::ApplyStates(s_states);
glClear(mask); glClear(mask);
} }
} }