kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now using VAO's (OES_vertex_array_object extension) to improve performance of scenes with many materials and objects

Browse Source 
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%40140
This commit is contained in:
kearwood
2012-10-25 18:28:30 +00:00
parent 825c78ab80
commit 15ebea1533
4 changed files with 102 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
KREngine/KREngine/Classes/KRCamera.cpp
View File

@@ -753,7 +753,9 @@ void KRCamera::renderPost()
GLDEBUG(glBindTexture(GL_TEXTURE_2D, compositeDepthTexture)); GLDEBUG(glBindTexture(GL_TEXTURE_2D, compositeDepthTexture));
// Update attribute values. // Update attribute values.
#if GL_OES_vertex_array_object
GLDEBUG(glBindVertexArrayOES(0));
#endif
m_pContext->getModelManager()->configureAttribs(true, false, false, true, false); m_pContext->getModelManager()->configureAttribs(true, false, false, true, false);
GLDEBUG(glVertexAttribPointer(KRShader::KRENGINE_ATTRIB_TEXUVA, 2, GL_FLOAT, 0, 0, KRENGINE_VERTICES_2D_SQUARE_UV)); GLDEBUG(glVertexAttribPointer(KRShader::KRENGINE_ATTRIB_TEXUVA, 2, GL_FLOAT, 0, 0, KRENGINE_VERTICES_2D_SQUARE_UV));
@@ -811,7 +813,9 @@ void KRCamera::renderPost()
dTexScale * iCol + dTexScale, dTexScale * iRow + dTexScale, dTexScale * iCol + dTexScale, dTexScale * iRow + dTexScale,
dTexScale * iCol + dTexScale, dTexScale * iRow dTexScale * iCol + dTexScale, dTexScale * iRow
}; };
#if GL_OES_vertex_array_object
GLDEBUG(glBindVertexArrayOES(0));
#endif
m_pContext->getModelManager()->configureAttribs(true, false, false, true, false); m_pContext->getModelManager()->configureAttribs(true, false, false, true, false);
GLDEBUG(glVertexAttribPointer(KRShader::KRENGINE_ATTRIB_TEXUVA, 2, GL_FLOAT, 0, 0, charTexCoords)); GLDEBUG(glVertexAttribPointer(KRShader::KRENGINE_ATTRIB_TEXUVA, 2, GL_FLOAT, 0, 0, charTexCoords));
GLDEBUG(glVertexAttribPointer(KRShader::KRENGINE_ATTRIB_VERTEX, 2, GL_FLOAT, 0, 0, charVertices)); GLDEBUG(glVertexAttribPointer(KRShader::KRENGINE_ATTRIB_VERTEX, 2, GL_FLOAT, 0, 0, charVertices));

81
KREngine/KREngine/Classes/KRModelManager.cpp
View File

@@ -35,14 +35,10 @@
#import "KRModel.h" #import "KRModel.h"
KRModelManager::KRModelManager(KRContext &context) : KRContextObject(context) { KRModelManager::KRModelManager(KRContext &context) : KRContextObject(context) {
m_currentVBO.handle = 0; m_currentVBO.vbo_handle = 0;
m_currentVBO.vao_handle = 0;
m_currentVBO.data = NULL; m_currentVBO.data = NULL;
m_vboMemUsed = 0; m_vboMemUsed = 0;
m_bVBOAttribEnabled_Vertex = false;
m_bVBOAttribEnabled_Normal = false;
m_bVBOAttribEnabled_Tangent = false;
m_bVBOAttribEnabled_UVA = false;
m_bVBOAttribEnabled_UVB = false;
} }
KRModelManager::~KRModelManager() { KRModelManager::~KRModelManager() {
@@ -87,11 +83,6 @@ std::vector<KRModel *> KRModelManager::getModel(const char *szName) {
return matching_models; return matching_models;
} }
KRModel *KRModelManager::getFirstModel() {
static std::map<std::string, KRModel *>::iterator model_itr = m_models.begin();
return (*model_itr).second;
}
std::multimap<std::string, KRModel *> KRModelManager::getModels() { std::multimap<std::string, KRModel *> KRModelManager::getModels() {
return m_models; return m_models;
} }
@@ -101,7 +92,8 @@ void KRModelManager::unbindVBO() {
GLDEBUG(glBindBuffer(GL_ARRAY_BUFFER, 0)); GLDEBUG(glBindBuffer(GL_ARRAY_BUFFER, 0));
m_currentVBO.size = 0; m_currentVBO.size = 0;
m_currentVBO.data = NULL; m_currentVBO.data = NULL;
m_currentVBO.handle = -1; m_currentVBO.vbo_handle = -1;
m_currentVBO.vao_handle = -1;
} }
} }
@@ -111,12 +103,22 @@ void KRModelManager::bindVBO(GLvoid *data, GLsizeiptr size, bool enable_vertex,
if(m_vbosActive.find(data) != m_vbosActive.end()) { if(m_vbosActive.find(data) != m_vbosActive.end()) {
m_currentVBO = m_vbosActive[data]; m_currentVBO = m_vbosActive[data];
GLDEBUG(glBindBuffer(GL_ARRAY_BUFFER, m_currentVBO.handle)); #if GL_OES_vertex_array_object
GLDEBUG(glBindVertexArrayOES(m_currentVBO.vao_handle));
#else
GLDEBUG(glBindBuffer(GL_ARRAY_BUFFER, m_currentVBO.vbo_handle));
configureAttribs(enable_vertex, enable_normal, enable_tangent, enable_uva, enable_uvb);
#endif
} else if(m_vbosPool.find(data) != m_vbosPool.end()) { } else if(m_vbosPool.find(data) != m_vbosPool.end()) {
m_currentVBO = m_vbosPool[data]; m_currentVBO = m_vbosPool[data];
m_vbosPool.erase(data); m_vbosPool.erase(data);
m_vbosActive[data] = m_currentVBO; m_vbosActive[data] = m_currentVBO;
GLDEBUG(glBindBuffer(GL_ARRAY_BUFFER, m_currentVBO.handle)); #if GL_OES_vertex_array_object
GLDEBUG(glBindVertexArrayOES(m_currentVBO.vao_handle));
#else
GLDEBUG(glBindBuffer(GL_ARRAY_BUFFER, m_currentVBO.vbo_handle));
configureAttribs(enable_vertex, enable_normal, enable_tangent, enable_uva, enable_uvb);
#endif
} else { } else {
m_vboMemUsed += size; m_vboMemUsed += size;
@@ -127,83 +129,67 @@ void KRModelManager::bindVBO(GLvoid *data, GLsizeiptr size, bool enable_vertex,
} }
std::map<GLvoid *, vbo_info_type>::iterator first_itr = m_vbosPool.begin(); std::map<GLvoid *, vbo_info_type>::iterator first_itr = m_vbosPool.begin();
vbo_info_type firstVBO = first_itr->second; vbo_info_type firstVBO = first_itr->second;
GLDEBUG(glDeleteBuffers(1, &firstVBO.handle)); #if GL_OES_vertex_array_object
GLDEBUG(glDeleteVertexArraysOES(1, &firstVBO.vao_handle));
#endif
GLDEBUG(glDeleteBuffers(1, &firstVBO.vbo_handle));
m_vboMemUsed -= firstVBO.size; m_vboMemUsed -= firstVBO.size;
m_vbosPool.erase(first_itr); m_vbosPool.erase(first_itr);
fprintf(stderr, "VBO Swapping...\n"); fprintf(stderr, "VBO Swapping...\n");
} }
m_currentVBO.handle = -1; m_currentVBO.vao_handle = -1;
GLDEBUG(glGenBuffers(1, &m_currentVBO.handle)); m_currentVBO.vbo_handle = -1;
GLDEBUG(glGenBuffers(1, &m_currentVBO.vbo_handle));
#if GL_OES_vertex_array_object
GLDEBUG(glGenVertexArraysOES(1, &m_currentVBO.vao_handle));
GLDEBUG(glBindVertexArrayOES(m_currentVBO.vao_handle));
#endif
GLDEBUG(glBindBuffer(GL_ARRAY_BUFFER, m_currentVBO.handle)); GLDEBUG(glBindBuffer(GL_ARRAY_BUFFER, m_currentVBO.vbo_handle));
GLDEBUG(glBufferData(GL_ARRAY_BUFFER, size, data, GL_STATIC_DRAW)); GLDEBUG(glBufferData(GL_ARRAY_BUFFER, size, data, GL_STATIC_DRAW));
//fprintf(stderr, "glBufferData(GL_ARRAY_BUFFER, %ld, data, GL_STATIC_DRAW)\n", size); configureAttribs(enable_vertex, enable_normal, enable_tangent, enable_uva, enable_uvb);
m_currentVBO.size = size; m_currentVBO.size = size;
m_currentVBO.data = data; m_currentVBO.data = data;
m_vbosActive[data] = m_currentVBO; m_vbosActive[data] = m_currentVBO;
} }
configureAttribs(enable_vertex, enable_normal, enable_tangent, enable_uva, enable_uvb);
} }
// fprintf(stderr, "VBO Mem: %i Kbyte Texture Mem: %i Kbyte\n", (int)m_pContext->getModelManager()->getMemUsed() / 1024, (int)m_pContext->getTextureManager()->getMemUsed() / 1024);
} }
void KRModelManager::configureAttribs(bool enable_vertex, bool enable_normal, bool enable_tangent, bool enable_uva, bool enable_uvb) void KRModelManager::configureAttribs(bool enable_vertex, bool enable_normal, bool enable_tangent, bool enable_uva, bool enable_uvb)
{ {
bool reconfigured = false;
if(m_bVBOAttribEnabled_Vertex != enable_vertex) {
if(enable_vertex) { if(enable_vertex) {
GLDEBUG(glEnableVertexAttribArray(KRShader::KRENGINE_ATTRIB_VERTEX)); GLDEBUG(glEnableVertexAttribArray(KRShader::KRENGINE_ATTRIB_VERTEX));
} else { } else {
GLDEBUG(glDisableVertexAttribArray(KRShader::KRENGINE_ATTRIB_VERTEX)); GLDEBUG(glDisableVertexAttribArray(KRShader::KRENGINE_ATTRIB_VERTEX));
} }
m_bVBOAttribEnabled_Vertex = enable_vertex;
reconfigured = true;
}
if(m_bVBOAttribEnabled_Normal != enable_normal) {
if(enable_normal) { if(enable_normal) {
GLDEBUG(glEnableVertexAttribArray(KRShader::KRENGINE_ATTRIB_NORMAL)); GLDEBUG(glEnableVertexAttribArray(KRShader::KRENGINE_ATTRIB_NORMAL));
} else { } else {
GLDEBUG(glDisableVertexAttribArray(KRShader::KRENGINE_ATTRIB_NORMAL)); GLDEBUG(glDisableVertexAttribArray(KRShader::KRENGINE_ATTRIB_NORMAL));
} }
m_bVBOAttribEnabled_Normal = enable_normal;
reconfigured = true;
}
if(m_bVBOAttribEnabled_Tangent != enable_tangent) {
if(enable_tangent) { if(enable_tangent) {
GLDEBUG(glEnableVertexAttribArray(KRShader::KRENGINE_ATTRIB_TANGENT)); GLDEBUG(glEnableVertexAttribArray(KRShader::KRENGINE_ATTRIB_TANGENT));
} else { } else {
GLDEBUG(glDisableVertexAttribArray(KRShader::KRENGINE_ATTRIB_TANGENT)); GLDEBUG(glDisableVertexAttribArray(KRShader::KRENGINE_ATTRIB_TANGENT));
} }
m_bVBOAttribEnabled_Tangent = enable_tangent;
reconfigured = true;
}
if(m_bVBOAttribEnabled_UVA != enable_uva) {
if(enable_uva) { if(enable_uva) {
GLDEBUG(glEnableVertexAttribArray(KRShader::KRENGINE_ATTRIB_TEXUVA)); GLDEBUG(glEnableVertexAttribArray(KRShader::KRENGINE_ATTRIB_TEXUVA));
} else { } else {
GLDEBUG(glDisableVertexAttribArray(KRShader::KRENGINE_ATTRIB_TEXUVA)); GLDEBUG(glDisableVertexAttribArray(KRShader::KRENGINE_ATTRIB_TEXUVA));
} }
m_bVBOAttribEnabled_UVA = enable_uva;
reconfigured = true;
}
if(m_bVBOAttribEnabled_UVB != enable_uvb) {
if(enable_uvb) { if(enable_uvb) {
GLDEBUG(glEnableVertexAttribArray(KRShader::KRENGINE_ATTRIB_TEXUVB)); GLDEBUG(glEnableVertexAttribArray(KRShader::KRENGINE_ATTRIB_TEXUVB));
} else { } else {
GLDEBUG(glDisableVertexAttribArray(KRShader::KRENGINE_ATTRIB_TEXUVB)); GLDEBUG(glDisableVertexAttribArray(KRShader::KRENGINE_ATTRIB_TEXUVB));
} }
m_bVBOAttribEnabled_UVB = enable_uvb;
reconfigured = true;
}
if(reconfigured || true) {
int data_size = 0; int data_size = 0;
if(enable_vertex) { if(enable_vertex) {
data_size += sizeof(KRModel::KRVector3D); data_size += sizeof(KRModel::KRVector3D);
@@ -243,7 +229,6 @@ void KRModelManager::configureAttribs(bool enable_vertex, bool enable_normal, bo
offset += sizeof(KRModel::TexCoord); offset += sizeof(KRModel::TexCoord);
} }
} }
}
long KRModelManager::getMemUsed() long KRModelManager::getMemUsed()
{ {

12
KREngine/KREngine/Classes/KRModelManager.h
View File

@@ -52,7 +52,6 @@ public:
KRModel *loadModel(const char *szName, KRDataBlock *pData); KRModel *loadModel(const char *szName, KRDataBlock *pData);
std::vector<KRModel *> getModel(const char *szName); std::vector<KRModel *> getModel(const char *szName);
KRModel *getFirstModel();
std::vector<std::string> getModelNames(); std::vector<std::string> getModelNames();
std::multimap<std::string, KRModel *> getModels(); std::multimap<std::string, KRModel *> getModels();
@@ -68,7 +67,8 @@ private:
std::multimap<std::string, KRModel *> m_models; // Multiple models with the same name/key may be inserted, representing multiple LOD levels of the model std::multimap<std::string, KRModel *> m_models; // Multiple models with the same name/key may be inserted, representing multiple LOD levels of the model
typedef struct vbo_info { typedef struct vbo_info {
GLuint handle; GLuint vbo_handle;
GLuint vao_handle;
GLsizeiptr size; GLsizeiptr size;
GLvoid *data; GLvoid *data;
} vbo_info_type; } vbo_info_type;
@@ -78,14 +78,6 @@ private:
std::map<GLvoid *, vbo_info_type> m_vbosActive; std::map<GLvoid *, vbo_info_type> m_vbosActive;
std::map<GLvoid *, vbo_info_type> m_vbosPool; std::map<GLvoid *, vbo_info_type> m_vbosPool;
bool m_bVBOAttribEnabled_Vertex;
bool m_bVBOAttribEnabled_Normal;
bool m_bVBOAttribEnabled_Tangent;
bool m_bVBOAttribEnabled_UVA;
bool m_bVBOAttribEnabled_UVB;
}; };
#endif #endif

3
KREngine/KREngine/Classes/KRPointLight.cpp
View File

@@ -114,6 +114,9 @@ void KRPointLight::render(KRCamera *pCamera, KRContext *pContext, KRMat4 &viewMa
m_pContext->getModelManager()->bindVBO((void *)KRENGINE_VBO_2D_SQUARE, KRENGINE_VBO_2D_SQUARE_SIZE, true, false, false, true, false); m_pContext->getModelManager()->bindVBO((void *)KRENGINE_VBO_2D_SQUARE, KRENGINE_VBO_2D_SQUARE_SIZE, true, false, false, true, false);
GLDEBUG(glDrawArrays(GL_TRIANGLE_STRIP, 0, 4)); GLDEBUG(glDrawArrays(GL_TRIANGLE_STRIP, 0, 4));
} else { } else {
#if GL_OES_vertex_array_object
GLDEBUG(glBindVertexArrayOES(0));
#endif
m_pContext->getModelManager()->configureAttribs(true, false, false, false, false); m_pContext->getModelManager()->configureAttribs(true, false, false, false, false);
// Render sphere of light's influence // Render sphere of light's influence
generateMesh(); generateMesh();