lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-27 17:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for KHR_debug and ensure ClientMemoryIBO is fully created

Browse Source
This commit is contained in:
baldurk
2018-06-07 19:27:57 +01:00
parent 6ceccb678b
commit 3fd0707641
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_driver.cpp
+23 -7
View File
@@ -1125,6 +1125,9 @@ void WrappedOpenGL::ActivateContext(GLWindowingData winData)
GLuint prevArrayBuffer = 0;
glGetIntegerv(eGL_ARRAY_BUFFER_BINDING, (GLint *)&prevArrayBuffer);
GLuint prevElementArrayBuffer = 0;
glGetIntegerv(eGL_ELEMENT_ARRAY_BUFFER_BINDING, (GLint *)&prevElementArrayBuffer);
// Initialize VBOs used in case we copy from client memory.
gl_CurChunk = GLChunk::glGenBuffers;
glGenBuffers(ARRAY_COUNT(ctxdata.m_ClientMemoryVBOs), ctxdata.m_ClientMemoryVBOs);
@@ -1137,19 +1140,32 @@ void WrappedOpenGL::ActivateContext(GLWindowingData winData)
gl_CurChunk = GLChunk::glBufferData;
glBufferData(eGL_ARRAY_BUFFER, 64, NULL, eGL_DYNAMIC_DRAW);
if(HasExt[KHR_debug])
{
gl_CurChunk = GLChunk::glObjectLabel;
glObjectLabel(eGL_BUFFER, ctxdata.m_ClientMemoryVBOs[i], -1,
StringFormat::Fmt("Client-memory pointer data (VB %zu)", i).c_str());
}
}
gl_CurChunk = GLChunk::glGenBuffers;
glGenBuffers(1, &ctxdata.m_ClientMemoryIBO);
glBindBuffer(eGL_ELEMENT_ARRAY_BUFFER, ctxdata.m_ClientMemoryIBO);
glBufferData(eGL_ELEMENT_ARRAY_BUFFER, 64, NULL, eGL_DYNAMIC_DRAW);
if(HasExt[KHR_debug])
{
gl_CurChunk = GLChunk::glObjectLabel;
glObjectLabel(eGL_BUFFER, ctxdata.m_ClientMemoryVBOs[i], -1,
StringFormat::Fmt("Client-memory pointer data (VB %zu)", i).c_str());
glObjectLabel(eGL_BUFFER, ctxdata.m_ClientMemoryIBO, -1,
"Client-memory pointer data (IB)");
}
gl_CurChunk = GLChunk::glBindBuffer;
glBindBuffer(eGL_ARRAY_BUFFER, prevArrayBuffer);
gl_CurChunk = GLChunk::glGenBuffers;
glGenBuffers(1, &ctxdata.m_ClientMemoryIBO);
gl_CurChunk = GLChunk::glObjectLabel;
glObjectLabel(eGL_BUFFER, ctxdata.m_ClientMemoryIBO, -1, "Client-memory pointer data (IB)");
gl_CurChunk = GLChunk::glBindBuffer;
glBindBuffer(eGL_ELEMENT_ARRAY_BUFFER, prevElementArrayBuffer);
}
if(IsCaptureMode(m_State))