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

Fixed rare bug 

Former-commit-id: 057e83b27377c1a8b0d8b652b86c3a2b837c4648
This commit is contained in:
Lynix 2013-08-06 23:46:26 +02:00
parent 901b917d37
commit 6de41bb9cf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Nazara/Renderer/HardwareBuffer.cpp
View File

@ -76,7 +76,7 @@ void NzHardwareBuffer::Bind()
} }
#endif #endif
glBindBuffer(NzOpenGL::BufferTarget[m_type], m_buffer); NzOpenGL::BindBuffer(m_type, m_buffer);
} }
bool NzHardwareBuffer::Create(unsigned int size, nzBufferUsage usage) bool NzHardwareBuffer::Create(unsigned int size, nzBufferUsage usage)
@ -87,6 +87,7 @@ bool NzHardwareBuffer::Create(unsigned int size, nzBufferUsage usage)
glGenBuffers(1, &m_buffer); glGenBuffers(1, &m_buffer);
NzOpenGL::BindBuffer(m_type, m_buffer); NzOpenGL::BindBuffer(m_type, m_buffer);
glBufferData(NzOpenGL::BufferTarget[m_type], size, nullptr, NzOpenGL::BufferUsage[usage]); glBufferData(NzOpenGL::BufferTarget[m_type], size, nullptr, NzOpenGL::BufferUsage[usage]);
return true; return true;
@ -134,7 +135,7 @@ bool NzHardwareBuffer::Fill(const void* data, unsigned int offset, unsigned int
// Une erreur rare est survenue, nous devons réinitialiser le buffer // Une erreur rare est survenue, nous devons réinitialiser le buffer
NazaraError("Failed to unmap buffer, reinitialising content... (OpenGL error : 0x" + NzString::Number(glGetError(), 16) + ')'); NazaraError("Failed to unmap buffer, reinitialising content... (OpenGL error : 0x" + NzString::Number(glGetError(), 16) + ')');
glBufferData(NzOpenGL::BufferTarget[m_type], totalSize, nullptr, NzOpenGL::BufferUsage[m_parent->GetStorage()]); glBufferData(NzOpenGL::BufferTarget[m_type], totalSize, nullptr, NzOpenGL::BufferUsage[m_parent->GetUsage()]);
return false; return false;
} }
@ -168,7 +169,7 @@ bool NzHardwareBuffer::Unmap()
if (glUnmapBuffer(NzOpenGL::BufferTarget[m_type]) != GL_TRUE) if (glUnmapBuffer(NzOpenGL::BufferTarget[m_type]) != GL_TRUE)
{ {
glBufferData(NzOpenGL::BufferTarget[m_type], m_parent->GetSize(), nullptr, NzOpenGL::BufferUsage[m_parent->GetStorage()]); glBufferData(NzOpenGL::BufferTarget[m_type], m_parent->GetSize(), nullptr, NzOpenGL::BufferUsage[m_parent->GetUsage()]);
// Une erreur rare est survenue, nous devons réinitialiser le buffer // Une erreur rare est survenue, nous devons réinitialiser le buffer
NazaraError("Failed to unmap buffer, reinitialising content... (OpenGL error : 0x" + NzString::Number(glGetError(), 16) + ')'); NazaraError("Failed to unmap buffer, reinitialising content... (OpenGL error : 0x" + NzString::Number(glGetError(), 16) + ')');