piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

OGL: Move attributeless VAO creation to Init.

Browse Source 
This way we won't trash an existing bound VBO by mistake.
This commit is contained in:
Unknown W. Brackets
2014-12-11 01:00:37 -08:00
parent 290fd545e6
commit de2abbed17
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/VideoBackends/OGL/GLUtil.cpp
View File

@ -115,12 +115,14 @@ GLuint OpenGL_CompileProgram(const char* vertexShader, const char* fragmentShade
return programID;
}
static void CreateAttributelessVAO()
void OpenGL_CreateAttributelessVAO()
{
glGenVertexArrays(1, &attributelessVAO);
_dbg_assert_msg_(VIDEO, attributelessVAO != 0, "Attributeless VAO should have been created successfully.")
// In a compatibility context, we require a valid, bound array buffer.
glGenBuffers(1, &attributelessVBO);
_dbg_assert_msg_(VIDEO, attributelessVBO != 0, "Attributeless VBO should have been created successfully.")
// Initialize the buffer with nothing.
glBindBuffer(GL_ARRAY_BUFFER, attributelessVBO);
@ -132,16 +134,14 @@ static void CreateAttributelessVAO()
void OpenGL_BindAttributelessVAO()
{
if (attributelessVAO == 0)
CreateAttributelessVAO();
_dbg_assert_msg_(VIDEO, attributelessVAO != 0, "Attributeless VAO should have already been created.")
glBindVertexArray(attributelessVAO);
glBindBuffer(GL_ARRAY_BUFFER, attributelessVBO);
}
void OpenGL_DeleteAttributelessVAO()
{
if (attributelessVAO)
_dbg_assert_msg_(VIDEO, attributelessVAO != 0, "Attributeless VAO should have already been created.")
if (attributelessVAO != 0)
{
glDeleteVertexArrays(1, &attributelessVAO);
glDeleteBuffers(1, &attributelessVBO);