From 9e96a2061fb00ee228842b86dc591852a23e45be Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 25 Jan 2015 17:19:35 +0100 Subject: [PATCH] Fixed compile errors introducted in 228ecfe7e5f59d8c4091c3ebfee8190f66cf62ed [formerly 837c414856dbb7b5be20fd745359b3f1e7791c20] Former-commit-id: efe88a0a209916b0aeea2813ec074182ab3a7adf --- src/Nazara/Graphics/DeferredGeometryPass.cpp | 4 ++-- src/Nazara/Graphics/ForwardRenderTechnique.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Nazara/Graphics/DeferredGeometryPass.cpp b/src/Nazara/Graphics/DeferredGeometryPass.cpp index c38c45cdd..0b2616cc4 100644 --- a/src/Nazara/Graphics/DeferredGeometryPass.cpp +++ b/src/Nazara/Graphics/DeferredGeometryPass.cpp @@ -142,7 +142,7 @@ bool NzDeferredGeometryPass::Process(const NzScene* scene, unsigned int firstWor instanceMatrices += renderedInstanceCount; // Et on affiche - InstancedDrawFunc(renderedInstanceCount, meshData.primitiveMode, 0, indexCount); + instancedDrawFunc(renderedInstanceCount, meshData.primitiveMode, 0, indexCount); } } else @@ -153,7 +153,7 @@ bool NzDeferredGeometryPass::Process(const NzScene* scene, unsigned int firstWor for (const NzMatrix4f& matrix : instances) { NzRenderer::SetMatrix(nzMatrixType_World, matrix); - DrawFunc(meshData.primitiveMode, 0, indexCount); + drawFunc(meshData.primitiveMode, 0, indexCount); } } diff --git a/src/Nazara/Graphics/ForwardRenderTechnique.cpp b/src/Nazara/Graphics/ForwardRenderTechnique.cpp index 534ecf449..5605812ec 100644 --- a/src/Nazara/Graphics/ForwardRenderTechnique.cpp +++ b/src/Nazara/Graphics/ForwardRenderTechnique.cpp @@ -544,7 +544,7 @@ void NzForwardRenderTechnique::DrawOpaqueModels(const NzScene* scene) const instanceMatrices += renderedInstanceCount; // Et on affiche - InstancedDrawFunc(renderedInstanceCount, meshData.primitiveMode, 0, indexCount); + instancedDrawFunc(renderedInstanceCount, meshData.primitiveMode, 0, indexCount); } } @@ -598,7 +598,7 @@ void NzForwardRenderTechnique::DrawOpaqueModels(const NzScene* scene) const NzLight::Disable(shader, shaderUniforms->lightUniforms, shaderUniforms->lightOffset*i); // Et on passe à l'affichage - DrawFunc(meshData.primitiveMode, 0, indexCount); + drawFunc(meshData.primitiveMode, 0, indexCount); } NzRenderer::Enable(nzRendererParameter_Blend, false); @@ -613,7 +613,7 @@ void NzForwardRenderTechnique::DrawOpaqueModels(const NzScene* scene) const for (const NzMatrix4f& matrix : instances) { NzRenderer::SetMatrix(nzMatrixType_World, matrix); - DrawFunc(meshData.primitiveMode, 0, indexCount); + drawFunc(meshData.primitiveMode, 0, indexCount); } } } @@ -706,7 +706,7 @@ void NzForwardRenderTechnique::DrawTransparentModels(const NzScene* scene) const NzLight::Disable(shader, shaderUniforms->lightUniforms, shaderUniforms->lightOffset*i); NzRenderer::SetMatrix(nzMatrixType_World, matrix); - DrawFunc(meshData.primitiveMode, 0, indexCount); + drawFunc(meshData.primitiveMode, 0, indexCount); } }