diff --git a/renderdoc/driver/gl/gl_manager.h b/renderdoc/driver/gl/gl_manager.h index dbcb7f158..3a2a2e893 100644 --- a/renderdoc/driver/gl/gl_manager.h +++ b/renderdoc/driver/gl/gl_manager.h @@ -118,6 +118,13 @@ class GLResourceManager : public ResourceManager return ResourceManager::GetResourceRecord(GetID(res)); } + using ResourceManager::MarkDirtyResource; + + void MarkDirtyResource(GLResource res) + { + return ResourceManager::MarkDirtyResource(GetID(res)); + } + void RegisterSync(void *ctx, GLsync sync, GLuint &name, ResourceId &id) { name = (GLuint)Atomic::Inc64(&m_SyncName); diff --git a/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp index 442613103..15b573e3c 100644 --- a/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp @@ -1551,7 +1551,7 @@ void WrappedOpenGL::glClearTexImage(GLuint texture, GLint level, GLenum format, } else if(m_State == WRITING_IDLE) { - GetResourceManager()->MarkDirtyResource(GetResourceManager()->GetID(TextureRes(GetCtx(), texture))); + GetResourceManager()->MarkDirtyResource(TextureRes(GetCtx(), texture)); } } @@ -1646,6 +1646,6 @@ void WrappedOpenGL::glClearTexSubImage(GLuint texture, GLint level, GLint xoffse } else if(m_State == WRITING_IDLE) { - GetResourceManager()->MarkDirtyResource(GetResourceManager()->GetID(TextureRes(GetCtx(), texture))); + GetResourceManager()->MarkDirtyResource(TextureRes(GetCtx(), texture)); } } diff --git a/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp index 238c0c28f..a06db19e4 100644 --- a/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp @@ -2200,7 +2200,7 @@ void WrappedOpenGL::glTextureSubImage1DEXT(GLuint texture, GLenum target, GLint { if(m_State == WRITING_IDLE && unpackbuf != 0) { - GetResourceManager()->MarkDirtyResource(GetResourceManager()->GetID(TextureRes(GetCtx(), texture))); + GetResourceManager()->MarkDirtyResource(TextureRes(GetCtx(), texture)); } else { @@ -2312,7 +2312,7 @@ void WrappedOpenGL::glTextureSubImage2DEXT(GLuint texture, GLenum target, GLint { if(m_State == WRITING_IDLE && unpackbuf != 0) { - GetResourceManager()->MarkDirtyResource(GetResourceManager()->GetID(TextureRes(GetCtx(), texture))); + GetResourceManager()->MarkDirtyResource(TextureRes(GetCtx(), texture)); } else { @@ -2426,7 +2426,7 @@ void WrappedOpenGL::glTextureSubImage3DEXT(GLuint texture, GLenum target, GLint { if(m_State == WRITING_IDLE && unpackbuf != 0) { - GetResourceManager()->MarkDirtyResource(GetResourceManager()->GetID(TextureRes(GetCtx(), texture))); + GetResourceManager()->MarkDirtyResource(TextureRes(GetCtx(), texture)); } else { @@ -2525,7 +2525,7 @@ void WrappedOpenGL::glCompressedTextureSubImage1DEXT(GLuint texture, GLenum targ { if(m_State == WRITING_IDLE && unpackbuf != 0) { - GetResourceManager()->MarkDirtyResource(GetResourceManager()->GetID(TextureRes(GetCtx(), texture))); + GetResourceManager()->MarkDirtyResource(TextureRes(GetCtx(), texture)); } else { @@ -2626,7 +2626,7 @@ void WrappedOpenGL::glCompressedTextureSubImage2DEXT(GLuint texture, GLenum targ { if(m_State == WRITING_IDLE && unpackbuf != 0) { - GetResourceManager()->MarkDirtyResource(GetResourceManager()->GetID(TextureRes(GetCtx(), texture))); + GetResourceManager()->MarkDirtyResource(TextureRes(GetCtx(), texture)); } else { @@ -2729,7 +2729,7 @@ void WrappedOpenGL::glCompressedTextureSubImage3DEXT(GLuint texture, GLenum targ { if(m_State == WRITING_IDLE && unpackbuf != 0) { - GetResourceManager()->MarkDirtyResource(GetResourceManager()->GetID(TextureRes(GetCtx(), texture))); + GetResourceManager()->MarkDirtyResource(TextureRes(GetCtx(), texture)); } else {