From 11d6ca5956d7966c63020722ed69278ec25dd28f Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 25 Nov 2014 22:40:56 +0000 Subject: [PATCH] Fix a few cases that were mistakenly not calling via 'real' funcptrs --- .../gl/wrappers/gl_framebuffer_funcs.cpp | 26 +++++++++---------- .../driver/gl/wrappers/gl_query_funcs.cpp | 10 +++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp index 84f426115..cd248c3a6 100644 --- a/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp @@ -88,12 +88,12 @@ bool WrappedOpenGL::Serialise_glNamedFramebufferTextureEXT(GLuint framebuffer, G GLResource res = GetResourceManager()->GetLiveResource(id); if(fbid == ResourceId()) { - glNamedFramebufferTextureEXT(0, Attach, res.name, Level); + m_Real.glNamedFramebufferTextureEXT(0, Attach, res.name, Level); } else { GLResource fbres = GetResourceManager()->GetLiveResource(fbid); - glNamedFramebufferTextureEXT(fbres.name, Attach, res.name, Level); + m_Real.glNamedFramebufferTextureEXT(fbres.name, Attach, res.name, Level); } if(m_State == READING) @@ -182,12 +182,12 @@ bool WrappedOpenGL::Serialise_glNamedFramebufferTexture1DEXT(GLuint framebuffer, GLResource res = GetResourceManager()->GetLiveResource(id); if(fbid == ResourceId()) { - glNamedFramebufferTexture1DEXT(0, Attach, TexTarget, res.name, Level); + m_Real.glNamedFramebufferTexture1DEXT(0, Attach, TexTarget, res.name, Level); } else { GLResource fbres = GetResourceManager()->GetLiveResource(fbid); - glNamedFramebufferTexture1DEXT(fbres.name, Attach, TexTarget, res.name, Level); + m_Real.glNamedFramebufferTexture1DEXT(fbres.name, Attach, TexTarget, res.name, Level); } if(m_State == READING) @@ -278,12 +278,12 @@ bool WrappedOpenGL::Serialise_glNamedFramebufferTexture2DEXT(GLuint framebuffer, GLResource res = GetResourceManager()->GetLiveResource(id); if(fbid == ResourceId()) { - glNamedFramebufferTexture2DEXT(0, Attach, TexTarget, res.name, Level); + m_Real.glNamedFramebufferTexture2DEXT(0, Attach, TexTarget, res.name, Level); } else { GLResource fbres = GetResourceManager()->GetLiveResource(fbid); - glNamedFramebufferTexture2DEXT(fbres.name, Attach, TexTarget, res.name, Level); + m_Real.glNamedFramebufferTexture2DEXT(fbres.name, Attach, TexTarget, res.name, Level); } if(m_State == READING) @@ -375,12 +375,12 @@ bool WrappedOpenGL::Serialise_glNamedFramebufferTexture3DEXT(GLuint framebuffer, GLResource res = GetResourceManager()->GetLiveResource(id); if(fbid == ResourceId()) { - glNamedFramebufferTexture3DEXT(0, Attach, TexTarget, res.name, Level, Zoffset); + m_Real.glNamedFramebufferTexture3DEXT(0, Attach, TexTarget, res.name, Level, Zoffset); } else { GLResource fbres = GetResourceManager()->GetLiveResource(fbid); - glNamedFramebufferTexture3DEXT(fbres.name, Attach, TexTarget, res.name, Level, Zoffset); + m_Real.glNamedFramebufferTexture3DEXT(fbres.name, Attach, TexTarget, res.name, Level, Zoffset); } if(m_State == READING) @@ -469,12 +469,12 @@ bool WrappedOpenGL::Serialise_glNamedFramebufferRenderbufferEXT(GLuint framebuff GLResource res = GetResourceManager()->GetLiveResource(id); if(fbid == ResourceId()) { - glNamedFramebufferRenderbufferEXT(0, Attach, RendBufTarget, res.name); + m_Real.glNamedFramebufferRenderbufferEXT(0, Attach, RendBufTarget, res.name); } else { GLResource fbres = GetResourceManager()->GetLiveResource(fbid); - glNamedFramebufferRenderbufferEXT(fbres.name, Attach, RendBufTarget, res.name); + m_Real.glNamedFramebufferRenderbufferEXT(fbres.name, Attach, RendBufTarget, res.name); } if(m_State == READING) @@ -558,12 +558,12 @@ bool WrappedOpenGL::Serialise_glNamedFramebufferTextureLayerEXT(GLuint framebuff GLResource res = GetResourceManager()->GetLiveResource(id); if(fbid == ResourceId()) { - glNamedFramebufferTextureLayerEXT(0, Attach, res.name, Level, Layer); + m_Real.glNamedFramebufferTextureLayerEXT(0, Attach, res.name, Level, Layer); } else { GLResource fbres = GetResourceManager()->GetLiveResource(fbid); - glNamedFramebufferTextureLayerEXT(fbres.name, Attach, res.name, Level, Layer); + m_Real.glNamedFramebufferTextureLayerEXT(fbres.name, Attach, res.name, Level, Layer); } if(m_State == READING) @@ -652,7 +652,7 @@ bool WrappedOpenGL::Serialise_glNamedFramebufferParameteriEXT(GLuint framebuffer if(fbid != ResourceId()) { GLResource fbres = GetResourceManager()->GetLiveResource(fbid); - glNamedFramebufferParameteriEXT(fbres.name, PName, Param); + m_Real.glNamedFramebufferParameteriEXT(fbres.name, PName, Param); } } diff --git a/renderdoc/driver/gl/wrappers/gl_query_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_query_funcs.cpp index bbe86e716..698bb5f2e 100644 --- a/renderdoc/driver/gl/wrappers/gl_query_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_query_funcs.cpp @@ -90,7 +90,7 @@ bool WrappedOpenGL::Serialise_glClientWaitSync(GLsync sync, GLbitfield flags, GL if(GetResourceManager()->HasLiveResource(id)) { GLResource res = GetResourceManager()->GetLiveResource(id); - glClientWaitSync(GetResourceManager()->GetSync(res.name), Flags, Timeout); + m_Real.glClientWaitSync(GetResourceManager()->GetSync(res.name), Flags, Timeout); } } @@ -123,7 +123,7 @@ bool WrappedOpenGL::Serialise_glWaitSync(GLsync sync, GLbitfield flags, GLuint64 if(GetResourceManager()->HasLiveResource(id)) { GLResource res = GetResourceManager()->GetLiveResource(id); - glWaitSync(GetResourceManager()->GetSync(res.name), Flags, Timeout); + m_Real.glWaitSync(GetResourceManager()->GetSync(res.name), Flags, Timeout); } } @@ -210,7 +210,7 @@ bool WrappedOpenGL::Serialise_glBeginQuery(GLenum target, GLuint qid) if(m_State < WRITING) { - glBeginQuery(Target, GetResourceManager()->GetLiveResource(id).name); + m_Real.glBeginQuery(Target, GetResourceManager()->GetLiveResource(id).name); } return true; @@ -262,7 +262,7 @@ bool WrappedOpenGL::Serialise_glEndQuery(GLenum target) if(m_State < WRITING) { - glEndQuery(Target); + m_Real.glEndQuery(Target); } return true; @@ -363,7 +363,7 @@ bool WrappedOpenGL::Serialise_glQueryCounter(GLuint query, GLenum target) if(m_State < WRITING) { - glQueryCounter(GetResourceManager()->GetLiveResource(id).name, Target); + m_Real.glQueryCounter(GetResourceManager()->GetLiveResource(id).name, Target); } return true;