Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-02-07 08:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Flush vertex attribs when the buffer object changes. Fixes #697.

Browse source
This commit is contained in:
Leonardo Zide 2021-04-17 10:38:23 -07:00
parent a93a119ee2
commit 48c6fad09e
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/lc_context.cpp
View file

@ -429,6 +429,9 @@ void lcContext::SetDefaultState()
mIndexBufferPointer = nullptr; mIndexBufferPointer = nullptr;
mVertexBufferOffset = (char*)~0; mVertexBufferOffset = (char*)~0;
for (int AttribIndex = 0; AttribIndex < static_cast<int>(lcProgramAttrib::Count); AttribIndex++)
mVertexAttribState[AttribIndex] = lcVertexAttribState();
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
mTexture2D = 0; mTexture2D = 0;
glBindTexture(GL_TEXTURE_CUBE_MAP, 0); glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
@ -874,7 +877,7 @@ void lcContext::SetVertexAttribPointer(lcProgramAttrib Attrib, GLint Size, GLenu
const int Index = static_cast<int>(Attrib); const int Index = static_cast<int>(Attrib);
lcVertexAttribState& State = mVertexAttribState[Index]; lcVertexAttribState& State = mVertexAttribState[Index];
if (State.Size != Size || State.Type != Type || State.Normalized != Normalized || State.Stride != Stride || State.Pointer != Pointer) if (State.Size != Size || State.Type != Type || State.Normalized != Normalized || State.Stride != Stride || State.Pointer != Pointer || State.VertexBufferObject != mVertexBufferObject)
{ {
glVertexAttribPointer(Index, Size, Type, Normalized, Stride, Pointer); glVertexAttribPointer(Index, Size, Type, Normalized, Stride, Pointer);
@ -883,6 +886,7 @@ void lcContext::SetVertexAttribPointer(lcProgramAttrib Attrib, GLint Size, GLenu
State.Normalized = Normalized; State.Normalized = Normalized;
State.Stride = Stride; State.Stride = Stride;
State.Pointer = Pointer; State.Pointer = Pointer;
State.VertexBufferObject = mVertexBufferObject;
} }
} }

1
common/lc_context.h
View file

@ -103,6 +103,7 @@ struct lcVertexAttribState
bool Enabled = 0; bool Enabled = 0;
GLsizei Stride = 0; GLsizei Stride = 0;
const void* Pointer = nullptr; const void* Pointer = nullptr;
GLuint VertexBufferObject = 0;
}; };
class lcContext : protected QOpenGLFunctions class lcContext : protected QOpenGLFunctions