lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't delete the 0 VAO or FBO, even if the application asks nicely

Browse Source
This commit is contained in:
baldurk
2020-01-07 16:56:22 +00:00
parent 319455194b
commit 29a650d859
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp
+1 -1
View File
@@ -4831,7 +4831,7 @@ void WrappedOpenGL::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
for(GLsizei i = 0; i < n; i++)
{
GLResource res = VertexArrayRes(GetCtx(), arrays[i]);
if(GetResourceManager()->HasCurrentResource(res))
if(GetResourceManager()->HasCurrentResource(res) && arrays[i])
{
if(GetResourceManager()->HasResourceRecord(res))
GetResourceManager()->GetResourceRecord(res)->Delete(GetResourceManager());
renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp
+1 -1
View File
@@ -2100,7 +2100,7 @@ void WrappedOpenGL::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
for(GLsizei i = 0; i < n; i++)
{
GLResource res = FramebufferRes(GetCtx(), framebuffers[i]);
if(GetResourceManager()->HasCurrentResource(res))
if(GetResourceManager()->HasCurrentResource(res) && framebuffers[i])
{
if(GetResourceManager()->HasResourceRecord(res))
GetResourceManager()->GetResourceRecord(res)->Delete(GetResourceManager());
util/test/demos/gl/gl_vao_0.cpp
+7
View File
@@ -107,6 +107,13 @@ void main()
float col[] = {0.4f, 0.5f, 0.6f, 1.0f};
glClearBufferfv(GL_COLOR, 0, col);
// try to delete VAO 0. Should do nothing
GLuint zero = 0;
glDeleteVertexArrays(1, &zero);
// same with FBO 0
glDeleteFramebuffers(1, &zero);
glUseProgram(program);
// use both buffers