lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-24 15:36:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Push and pop UBO binding separate from indexed UBO bindings

Browse Source
This commit is contained in:
baldurk
2018-11-13 12:49:51 +00:00
parent 588642c4c8
commit 6ee796203e
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_common.cpp
+11 -6
View File
@@ -941,9 +941,12 @@ void GLPushPopState::Push(bool modern)
if(modern)
{
GL.glGetIntegeri_v(eGL_UNIFORM_BUFFER_BINDING, 0, (GLint *)&ubo[0]);
GL.glGetIntegeri_v(eGL_UNIFORM_BUFFER_BINDING, 1, (GLint *)&ubo[1]);
GL.glGetIntegeri_v(eGL_UNIFORM_BUFFER_BINDING, 2, (GLint *)&ubo[2]);
// the non-indexed bind is separate from the indexed binds
GL.glGetIntegerv(eGL_UNIFORM_BUFFER_BINDING, (GLint *)&ubo);
GL.glGetIntegeri_v(eGL_UNIFORM_BUFFER_BINDING, 0, (GLint *)&idxubo[0]);
GL.glGetIntegeri_v(eGL_UNIFORM_BUFFER_BINDING, 1, (GLint *)&idxubo[1]);
GL.glGetIntegeri_v(eGL_UNIFORM_BUFFER_BINDING, 2, (GLint *)&idxubo[2]);
GL.glGetIntegerv(eGL_VERTEX_ARRAY_BINDING, (GLint *)&VAO);
}
@@ -1080,9 +1083,11 @@ void GLPushPopState::Pop(bool modern)
if(modern)
{
GL.glBindBufferBase(eGL_UNIFORM_BUFFER, 0, ubo[0]);
GL.glBindBufferBase(eGL_UNIFORM_BUFFER, 1, ubo[1]);
GL.glBindBufferBase(eGL_UNIFORM_BUFFER, 2, ubo[2]);
GL.glBindBufferBase(eGL_UNIFORM_BUFFER, 0, idxubo[0]);
GL.glBindBufferBase(eGL_UNIFORM_BUFFER, 1, idxubo[1]);
GL.glBindBufferBase(eGL_UNIFORM_BUFFER, 2, idxubo[2]);
GL.glBindBuffer(eGL_UNIFORM_BUFFER, ubo);
GL.glUseProgram(prog);
renderdoc/driver/gl/gl_common.h
+2 -1
View File
@@ -432,7 +432,8 @@ struct GLPushPopState
GLenum ActiveTexture;
GLuint tex0;
GLuint arraybuf;
GLuint ubo[3];
GLuint idxubo[3];
GLuint ubo;
GLuint prog;
GLuint pipe;
GLuint VAO;