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

Removed useless std::function from rendering code 

Former-commit-id: eaba729d5047d326fb2e746cec0621bfcf2eb1c5
This commit is contained in:
Lynix 2015-01-23 20:21:00 +01:00
parent f6df10dacf
commit 01a1badac7
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,9 @@ class NAZARA_API NzRenderer
friend NzTexture; friend NzTexture;
public: public:
using DrawCall = void (*)(nzPrimitiveMode, unsigned int, unsigned int);
using DrawCallInstanced = void (*)(unsigned int, nzPrimitiveMode, unsigned int, unsigned int);
NzRenderer() = delete; NzRenderer() = delete;
~NzRenderer() = delete; ~NzRenderer() = delete;

12
src/Nazara/Graphics/DeferredGeometryPass.cpp
View File

@ -101,20 +101,20 @@ bool NzDeferredGeometryPass::Process(const NzScene* scene, unsigned int firstWor
const NzVertexBuffer* vertexBuffer = meshData.vertexBuffer; const NzVertexBuffer* vertexBuffer = meshData.vertexBuffer;
// Gestion du draw call avant la boucle de rendu // Gestion du draw call avant la boucle de rendu
std::function<void(nzPrimitiveMode, unsigned int, unsigned int)> DrawFunc; NzRenderer::DrawCall drawFunc;
std::function<void(unsigned int, nzPrimitiveMode, unsigned int, unsigned int)> InstancedDrawFunc; NzRenderer::DrawCallInstanced instancedDrawFunc;
unsigned int indexCount; unsigned int indexCount;
if (indexBuffer) if (indexBuffer)
{ {
DrawFunc = NzRenderer::DrawIndexedPrimitives; drawFunc = NzRenderer::DrawIndexedPrimitives;
InstancedDrawFunc = NzRenderer::DrawIndexedPrimitivesInstanced; instancedDrawFunc = NzRenderer::DrawIndexedPrimitivesInstanced;
indexCount = indexBuffer->GetIndexCount(); indexCount = indexBuffer->GetIndexCount();
} }
else else
{ {
DrawFunc = NzRenderer::DrawPrimitives; drawFunc = NzRenderer::DrawPrimitives;
InstancedDrawFunc = NzRenderer::DrawPrimitivesInstanced; instancedDrawFunc = NzRenderer::DrawPrimitivesInstanced;
indexCount = vertexBuffer->GetVertexCount(); indexCount = vertexBuffer->GetVertexCount();
} }

18
src/Nazara/Graphics/ForwardRenderTechnique.cpp
View File

@ -470,20 +470,20 @@ void NzForwardRenderTechnique::DrawOpaqueModels(const NzScene* scene) const
const NzVertexBuffer* vertexBuffer = meshData.vertexBuffer; const NzVertexBuffer* vertexBuffer = meshData.vertexBuffer;
// Gestion du draw call avant la boucle de rendu // Gestion du draw call avant la boucle de rendu
std::function<void(nzPrimitiveMode, unsigned int, unsigned int)> DrawFunc; NzRenderer::DrawCall drawFunc;
std::function<void(unsigned int, nzPrimitiveMode, unsigned int, unsigned int)> InstancedDrawFunc; NzRenderer::DrawCallInstanced instancedDrawFunc;
unsigned int indexCount; unsigned int indexCount;
if (indexBuffer) if (indexBuffer)
{ {
DrawFunc = NzRenderer::DrawIndexedPrimitives; drawFunc = NzRenderer::DrawIndexedPrimitives;
InstancedDrawFunc = NzRenderer::DrawIndexedPrimitivesInstanced; instancedDrawFunc = NzRenderer::DrawIndexedPrimitivesInstanced;
indexCount = indexBuffer->GetIndexCount(); indexCount = indexBuffer->GetIndexCount();
} }
else else
{ {
DrawFunc = NzRenderer::DrawPrimitives; drawFunc = NzRenderer::DrawPrimitives;
InstancedDrawFunc = NzRenderer::DrawPrimitivesInstanced; instancedDrawFunc = NzRenderer::DrawPrimitivesInstanced;
indexCount = vertexBuffer->GetVertexCount(); indexCount = vertexBuffer->GetVertexCount();
} }
@ -672,17 +672,17 @@ void NzForwardRenderTechnique::DrawTransparentModels(const NzScene* scene) const
const NzVertexBuffer* vertexBuffer = meshData.vertexBuffer; const NzVertexBuffer* vertexBuffer = meshData.vertexBuffer;
// Gestion du draw call avant la boucle de rendu // Gestion du draw call avant la boucle de rendu
std::function<void(nzPrimitiveMode, unsigned int, unsigned int)> DrawFunc; NzRenderer::DrawCall drawFunc;
unsigned int indexCount; unsigned int indexCount;
if (indexBuffer) if (indexBuffer)
{ {
DrawFunc = NzRenderer::DrawIndexedPrimitives; drawFunc = NzRenderer::DrawIndexedPrimitives;
indexCount = indexBuffer->GetIndexCount(); indexCount = indexBuffer->GetIndexCount();
} }
else else
{ {
DrawFunc = NzRenderer::DrawPrimitives; drawFunc = NzRenderer::DrawPrimitives;
indexCount = vertexBuffer->GetVertexCount(); indexCount = vertexBuffer->GetVertexCount();
} }