lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-04 12:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to the proper context to fetch VAO/feedback initial data

Browse Source
This commit is contained in:
baldurk
2014-12-06 20:27:09 +00:00
parent bda809f9dc
commit e3374c74c2
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_manager.cpp
+15 -3
View File
@@ -282,6 +282,9 @@ bool GLResourceManager::Prepare_InitialState(GLResource res)
}
else if(res.Namespace == eResFeedback)
{
// need to be on the right context, as feedback objects are never shared
void *oldctx = m_GL->SwitchToContext(res.Context);
GLuint prevfeedback = 0;
gl.glGetIntegerv(eGL_TRANSFORM_FEEDBACK, (GLint *)&prevfeedback);
@@ -304,11 +307,17 @@ bool GLResourceManager::Prepare_InitialState(GLResource res)
SetInitialContents(Id, InitialContentData(GLResource(MakeNullResource), 0, (byte *)data));
gl.glBindTransformFeedback(eGL_TRANSFORM_FEEDBACK, prevfeedback);
// restore the previous context
m_GL->SwitchToContext(oldctx);
}
else if(res.Namespace == eResVertexArray)
{
GLuint VAO = 0;
gl.glGetIntegerv(eGL_VERTEX_ARRAY_BINDING, (GLint *)&VAO);
// need to be on the right context, as VAOs are never shared
void *oldctx = m_GL->SwitchToContext(res.Context);
GLuint prevVAO = 0;
gl.glGetIntegerv(eGL_VERTEX_ARRAY_BINDING, (GLint *)&prevVAO);
gl.glBindVertexArray(res.name);
@@ -340,7 +349,10 @@ bool GLResourceManager::Prepare_InitialState(GLResource res)
SetInitialContents(Id, InitialContentData(GLResource(MakeNullResource), 0, (byte *)data));
gl.glBindVertexArray(VAO);
gl.glBindVertexArray(prevVAO);
// restore the previous context
m_GL->SwitchToContext(oldctx);
}
else
{