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

OpenGL's VAOs are now used the right way 

Former-commit-id: 04a944b55d7406bc6028a2d90a5550b0d5e888f0
This commit is contained in:
Lynix 2013-06-24 00:24:22 +02:00
parent 3609f31708
commit 44fdb48384
3 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Nazara/Renderer/OpenGL.hpp
View File

@ -75,7 +75,6 @@ class NAZARA_API NzOpenGL
static void BindProgram(GLuint id);
static void BindTexture(nzImageType type, GLuint id);
static void BindTexture(unsigned int textureUnit, nzImageType type, GLuint id);
static void BindVertexArray(GLuint id);
static void DeleteBuffer(nzBufferType type, GLuint id);
static void DeleteProgram(GLuint id);

17
src/Nazara/Renderer/OpenGL.cpp
View File

@ -329,23 +329,6 @@ void NzOpenGL::BindTexture(unsigned int textureUnit, nzImageType type, GLuint id
}
}
void NzOpenGL::BindVertexArray(GLuint id)
{
#ifdef NAZARA_DEBUG
if (!s_contextStates)
{
NazaraError("No context activated");
return;
}
#endif
// Je ne pense pas que ça soit une bonne idée de le mettre en cache, c'est un objet "spécial"
glBindVertexArray(id);
// On invalide les bindings des buffers (Overridés par le VertexArray)
std::memset(s_contextStates->buffersBinding, 0, (nzBufferType_Max+1)*sizeof(GLuint));
}
void NzOpenGL::DeleteBuffer(nzBufferType type, GLuint id)
{
#ifdef NAZARA_DEBUG

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

@ -72,6 +72,7 @@ namespace
std::map<VAO_Key, unsigned int> s_vaos;
std::set<unsigned int> s_dirtyTextureUnits;
std::vector<TextureUnit> s_textureUnits;
GLuint s_currentVAO = 0;
NzBuffer* s_instancingBuffer = nullptr;
NzVertexBuffer* s_quadBuffer = nullptr;
NzMatrix4f s_matrix[totalMatrixCount];
@ -171,6 +172,8 @@ void NzRenderer::DrawIndexedPrimitives(nzPrimitiveMode mode, unsigned int firstI
glDrawElements(NzOpenGL::PrimitiveMode[mode], indexCount, type, ptr);
}
glBindVertexArray(0);
}
void NzRenderer::DrawIndexedPrimitivesInstanced(unsigned int instanceCount, nzPrimitiveMode mode, unsigned int firstIndex, unsigned int indexCount)
@ -243,6 +246,8 @@ void NzRenderer::DrawIndexedPrimitivesInstanced(unsigned int instanceCount, nzPr
glDrawElementsInstanced(NzOpenGL::PrimitiveMode[mode], indexCount, type, ptr, instanceCount);
}
glBindVertexArray(0);
}
void NzRenderer::DrawPrimitives(nzPrimitiveMode mode, unsigned int firstVertex, unsigned int vertexCount)
@ -270,6 +275,7 @@ void NzRenderer::DrawPrimitives(nzPrimitiveMode mode, unsigned int firstVertex,
}
glDrawArrays(NzOpenGL::PrimitiveMode[mode], firstVertex, vertexCount);
glBindVertexArray(0);
}
void NzRenderer::DrawPrimitivesInstanced(unsigned int instanceCount, nzPrimitiveMode mode, unsigned int firstVertex, unsigned int vertexCount)
@ -317,6 +323,7 @@ void NzRenderer::DrawPrimitivesInstanced(unsigned int instanceCount, nzPrimitive
}
glDrawArraysInstanced(NzOpenGL::PrimitiveMode[mode], firstVertex, vertexCount, instanceCount);
glBindVertexArray(0);
}
void NzRenderer::DrawTexture(unsigned int unit, const NzRectf& rect, const NzVector2f& uv0, const NzVector2f& uv1, float z)
@ -1467,7 +1474,6 @@ bool NzRenderer::EnsureStateUpdate()
#endif
bool update;
GLuint vao;
// Si les VAOs sont supportés, on entoure nos appels par ceux-ci
if (s_useVertexArrayObjects)
@ -1481,11 +1487,11 @@ bool NzRenderer::EnsureStateUpdate()
if (it == s_vaos.end())
{
// On créé notre VAO
glGenVertexArrays(1, &vao);
glBindVertexArray(vao);
glGenVertexArrays(1, &s_currentVAO);
glBindVertexArray(s_currentVAO);
// On l'ajoute à notre liste
s_vaos.insert(std::make_pair(key, static_cast<unsigned int>(vao)));
s_vaos.insert(std::make_pair(key, static_cast<unsigned int>(s_currentVAO)));
// Et on indique qu'on veut le programmer
update = true;
@ -1493,7 +1499,7 @@ bool NzRenderer::EnsureStateUpdate()
else
{
// Notre VAO existe déjà, il est donc inutile de le reprogrammer
vao = it->second;
s_currentVAO = it->second;
update = false;
}
@ -1564,11 +1570,9 @@ bool NzRenderer::EnsureStateUpdate()
if (update)
glBindVertexArray(0);
// Nous (re)bindons le VAO pour définir les attributs de vertice
NzOpenGL::BindVertexArray(vao);
// En cas de non-support des VAOs, les attributs doivent être respécifiés à chaque frame
s_updateFlags &= ~Update_VAO;
}
s_updateFlags &= ~Update_VAO;
}
#ifdef NAZARA_DEBUG
@ -1577,7 +1581,10 @@ bool NzRenderer::EnsureStateUpdate()
#endif
}
///FIXME: Comment détecter le besoin de réactiver le VAO ? (Est-ce même nécessaire ?)
// On bind notre VAO
if (s_useVertexArrayObjects)
glBindVertexArray(s_currentVAO);
// On vérifie que les textures actuellement bindées sont bien nos textures
for (unsigned int i = 0; i < s_maxTextureUnit; ++i)
{