From 13ed3dfe0ed964c0287e407c2ca4578fe65a16dd Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 13 May 2019 18:58:21 +0100 Subject: [PATCH] VAOs and FBOs shouldn't mask the reference type to read only --- renderdoc/driver/gl/gl_manager.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/renderdoc/driver/gl/gl_manager.cpp b/renderdoc/driver/gl/gl_manager.cpp index 793e53e0e..d9e0012ad 100644 --- a/renderdoc/driver/gl/gl_manager.cpp +++ b/renderdoc/driver/gl/gl_manager.cpp @@ -39,7 +39,7 @@ void GLResourceManager::MarkVAOReferenced(GLResource res, FrameRefType ref, bool { ContextPair &ctx = m_Driver->GetCtx(); - MarkResourceFrameReferenced(res, ref == eFrameRef_None ? eFrameRef_None : eFrameRef_Read); + MarkResourceFrameReferenced(res, ref); GLint numVBufferBindings = GetNumVertexBuffers(); @@ -47,12 +47,14 @@ void GLResourceManager::MarkVAOReferenced(GLResource res, FrameRefType ref, bool { GLuint buffer = GetBoundVertexBuffer(i); - MarkResourceFrameReferenced(BufferRes(ctx, buffer), ref); + MarkResourceFrameReferenced(BufferRes(ctx, buffer), + ref == eFrameRef_None ? eFrameRef_None : eFrameRef_Read); } GLuint ibuffer = 0; GL.glGetIntegerv(eGL_ELEMENT_ARRAY_BUFFER_BINDING, (GLint *)&ibuffer); - MarkResourceFrameReferenced(BufferRes(ctx, ibuffer), ref); + MarkResourceFrameReferenced(BufferRes(ctx, ibuffer), + ref == eFrameRef_None ? eFrameRef_None : eFrameRef_Read); } } @@ -61,7 +63,7 @@ void GLResourceManager::MarkFBOReferenced(GLResource res, FrameRefType ref) if(res.name == 0) return; - MarkResourceFrameReferenced(res, ref == eFrameRef_None ? eFrameRef_None : eFrameRef_Read); + MarkResourceFrameReferenced(res, ref); ContextPair &ctx = m_Driver->GetCtx();