From 43add1970476c6e4c84e7f360ff2d3718908051e Mon Sep 17 00:00:00 2001 From: baldurk Date: Sun, 7 Dec 2014 12:58:37 +0000 Subject: [PATCH] Store resource in record, since it's frequently accessed --- renderdoc/driver/gl/gl_manager.h | 1 + renderdoc/driver/gl/gl_resources.h | 2 + .../driver/gl/wrappers/gl_buffer_funcs.cpp | 28 ++++---- .../gl/wrappers/gl_framebuffer_funcs.cpp | 16 ++--- .../driver/gl/wrappers/gl_texture_funcs.cpp | 70 +++++++++---------- 5 files changed, 60 insertions(+), 57 deletions(-) diff --git a/renderdoc/driver/gl/gl_manager.h b/renderdoc/driver/gl/gl_manager.h index b012c359e..fa0382c61 100644 --- a/renderdoc/driver/gl/gl_manager.h +++ b/renderdoc/driver/gl/gl_manager.h @@ -148,6 +148,7 @@ class GLResourceManager : public ResourceManager GLResource res = GetCurrentResource(id); m_GLResourceRecords[res] = ret; + ret->Resource = res; return ret; } diff --git a/renderdoc/driver/gl/gl_resources.h b/renderdoc/driver/gl/gl_resources.h index 6d6cf535c..6aed45f67 100644 --- a/renderdoc/driver/gl/gl_resources.h +++ b/renderdoc/driver/gl/gl_resources.h @@ -169,6 +169,8 @@ struct GLResourceRecord : public ResourceRecord GLenum datatype; GLenum usage; + GLResource Resource; + void AllocShadowStorage(size_t size) { if(ShadowPtr[0] == NULL) diff --git a/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp index bd40f404b..ae508c9e5 100644 --- a/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp @@ -166,7 +166,7 @@ void WrappedOpenGL::glBindBuffer(GLenum target, GLuint buffer) // element array buffer binding is vertex array record state, record there (if we've not just stopped) if(m_State == WRITING_IDLE && target == eGL_ELEMENT_ARRAY_BUFFER && RecordUpdateCheck(cd.m_VertexArrayRecord)) { - GLuint vao = GetResourceManager()->GetCurrentResource(cd.m_VertexArrayRecord->GetResourceID()).name; + GLuint vao = cd.m_VertexArrayRecord->Resource.name; // use glVertexArrayElementBuffer to ensure the vertex array is bound when we bind the // element buffer @@ -181,7 +181,7 @@ void WrappedOpenGL::glBindBuffer(GLenum target, GLuint buffer) // store as transform feedback record state if(m_State == WRITING_IDLE && target == eGL_TRANSFORM_FEEDBACK_BUFFER && RecordUpdateCheck(cd.m_FeedbackRecord)) { - GLuint feedback = GetResourceManager()->GetCurrentResource(cd.m_FeedbackRecord->GetResourceID()).name; + GLuint feedback = cd.m_FeedbackRecord->Resource.name; // use glTransformFeedbackBufferBase to ensure the feedback object is bound when we bind the // buffer @@ -281,7 +281,7 @@ void WrappedOpenGL::glBufferStorage(GLenum target, GLsizeiptr size, const void * RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(BUFFERSTORAGE); - Serialise_glNamedBufferStorageEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glNamedBufferStorageEXT(record->Resource.name, size, data, flags); Chunk *chunk = scope.Get(); @@ -452,7 +452,7 @@ void WrappedOpenGL::glBufferData(GLenum target, GLsizeiptr size, const void *dat return; } - GLuint buffer = GetResourceManager()->GetCurrentResource(record->GetResourceID()).name; + GLuint buffer = record->Resource.name; // if we're recreating the buffer, clear the record and add new chunks. Normally // we would just mark this record as dirty and pick it up on the capture frame as initial @@ -590,7 +590,7 @@ void WrappedOpenGL::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr s GLResourceRecord *record = GetCtxData().m_BufferRecord[BufferIdx(target)]; RDCASSERT(record); - GLResource res = GetResourceManager()->GetCurrentResource(record->GetResourceID()); + GLResource res = record->Resource; if(m_HighTrafficResources.find(res) != m_HighTrafficResources.end() && m_State != WRITING_CAPFRAME) return; @@ -671,13 +671,13 @@ void WrappedOpenGL::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, G GLResourceRecord *writerecord = GetCtxData().m_BufferRecord[BufferIdx(writeTarget)]; RDCASSERT(readrecord && writerecord); - GLResource writeBuffer = GetResourceManager()->GetCurrentResource(writerecord->GetResourceID()); + GLResource writeBuffer = writerecord->Resource; if(m_HighTrafficResources.find(writeBuffer) != m_HighTrafficResources.end() && m_State != WRITING_CAPFRAME) return; SCOPED_SERIALISE_CONTEXT(COPYBUFFERSUBDATA); - Serialise_glNamedCopyBufferSubDataEXT(GetResourceManager()->GetCurrentResource(readrecord->GetResourceID()).name, + Serialise_glNamedCopyBufferSubDataEXT(readrecord->Resource.name, writeBuffer.name, readOffset, writeOffset, size); @@ -741,7 +741,7 @@ void WrappedOpenGL::glBindBufferBase(GLenum target, GLuint index, GLuint buffer) // store as transform feedback record state if(m_State == WRITING_IDLE && target == eGL_TRANSFORM_FEEDBACK_BUFFER && RecordUpdateCheck(cd.m_FeedbackRecord)) { - GLuint feedback = GetResourceManager()->GetCurrentResource(cd.m_FeedbackRecord->GetResourceID()).name; + GLuint feedback = cd.m_FeedbackRecord->Resource.name; // use glTransformFeedbackBufferBase to ensure the feedback object is bound when we bind the // buffer @@ -813,7 +813,7 @@ void WrappedOpenGL::glBindBufferRange(GLenum target, GLuint index, GLuint buffer // store as transform feedback record state if(m_State == WRITING_IDLE && target == eGL_TRANSFORM_FEEDBACK_BUFFER && RecordUpdateCheck(cd.m_FeedbackRecord)) { - GLuint feedback = GetResourceManager()->GetCurrentResource(cd.m_FeedbackRecord->GetResourceID()).name; + GLuint feedback = cd.m_FeedbackRecord->Resource.name; // use glTransformFeedbackBufferRange to ensure the feedback object is bound when we bind the // buffer @@ -895,7 +895,7 @@ void WrappedOpenGL::glBindBuffersBase(GLenum target, GLuint first, GLsizei count // store as transform feedback record state if(m_State == WRITING_IDLE && target == eGL_TRANSFORM_FEEDBACK_BUFFER && RecordUpdateCheck(cd.m_FeedbackRecord)) { - GLuint feedback = GetResourceManager()->GetCurrentResource(cd.m_FeedbackRecord->GetResourceID()).name; + GLuint feedback = cd.m_FeedbackRecord->Resource.name; for(int i=0; i < count; i++) { @@ -993,7 +993,7 @@ void WrappedOpenGL::glBindBuffersRange(GLenum target, GLuint first, GLsizei coun // store as transform feedback record state if(m_State == WRITING_IDLE && target == eGL_TRANSFORM_FEEDBACK_BUFFER && RecordUpdateCheck(cd.m_FeedbackRecord)) { - GLuint feedback = GetResourceManager()->GetCurrentResource(cd.m_FeedbackRecord->GetResourceID()).name; + GLuint feedback = cd.m_FeedbackRecord->Resource.name; for(int i=0; i < count; i++) { @@ -1167,7 +1167,7 @@ void *WrappedOpenGL::glMapBuffer(GLenum target, GLenum access) RDCASSERT(record); if(record) - return glMapNamedBufferEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, access); + return glMapNamedBufferEXT(record->Resource.name, access); RDCERR("glMapBuffer: Couldn't get resource record for target %x - no buffer bound?", target); } @@ -1331,7 +1331,7 @@ void *WrappedOpenGL::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr RDCASSERT(record); if(record) - return glMapNamedBufferRangeEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, offset, length, access); + return glMapNamedBufferRangeEXT(record->Resource.name, offset, length, access); RDCERR("glMapBufferRange: Couldn't get resource record for target %x - no buffer bound?", target); } @@ -1493,7 +1493,7 @@ GLboolean WrappedOpenGL::glUnmapBuffer(GLenum target) RDCASSERT(record); if(record) - return glUnmapNamedBufferEXT( GetResourceManager()->GetCurrentResource(record->GetResourceID()).name ); + return glUnmapNamedBufferEXT( record->Resource.name ); RDCERR("glUnmapBuffer: Couldn't get resource record for target %x - no buffer bound?", target); } diff --git a/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp index 7b0d8a9f4..75e57208f 100644 --- a/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp @@ -149,7 +149,7 @@ void WrappedOpenGL::glFramebufferTexture(GLenum target, GLenum attachment, GLuin } SCOPED_SERIALISE_CONTEXT(FRAMEBUFFER_TEX); - Serialise_glNamedFramebufferTextureEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glNamedFramebufferTextureEXT(record->Resource.name, attachment, texture, level); if(m_State == WRITING_IDLE) @@ -245,7 +245,7 @@ void WrappedOpenGL::glFramebufferTexture1D(GLenum target, GLenum attachment, GLe } SCOPED_SERIALISE_CONTEXT(FRAMEBUFFER_TEX1D); - Serialise_glNamedFramebufferTexture1DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glNamedFramebufferTexture1DEXT(record->Resource.name, attachment, textarget, texture, level); if(m_State == WRITING_IDLE) @@ -341,7 +341,7 @@ void WrappedOpenGL::glFramebufferTexture2D(GLenum target, GLenum attachment, GLe } SCOPED_SERIALISE_CONTEXT(FRAMEBUFFER_TEX2D); - Serialise_glNamedFramebufferTexture2DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glNamedFramebufferTexture2DEXT(record->Resource.name, attachment, textarget, texture, level); if(m_State == WRITING_IDLE) @@ -438,7 +438,7 @@ void WrappedOpenGL::glFramebufferTexture3D(GLenum target, GLenum attachment, GLe } SCOPED_SERIALISE_CONTEXT(FRAMEBUFFER_TEX3D); - Serialise_glNamedFramebufferTexture3DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glNamedFramebufferTexture3DEXT(record->Resource.name, attachment, textarget, texture, level, zoffset); if(m_State == WRITING_IDLE) @@ -528,7 +528,7 @@ void WrappedOpenGL::glFramebufferRenderbuffer(GLenum target, GLenum attachment, } SCOPED_SERIALISE_CONTEXT(FRAMEBUFFER_RENDBUF); - Serialise_glNamedFramebufferRenderbufferEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glNamedFramebufferRenderbufferEXT(record->Resource.name, attachment, renderbuffertarget, renderbuffer); if(m_State == WRITING_IDLE) @@ -620,7 +620,7 @@ void WrappedOpenGL::glFramebufferTextureLayer(GLenum target, GLenum attachment, } SCOPED_SERIALISE_CONTEXT(FRAMEBUFFER_TEXLAYER); - Serialise_glNamedFramebufferTextureLayerEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glNamedFramebufferTextureLayerEXT(record->Resource.name, attachment, texture, level, layer); if(m_State == WRITING_IDLE) @@ -693,7 +693,7 @@ void WrappedOpenGL::glFramebufferParameteri(GLenum target, GLenum pname, GLint p if(record == NULL) return; SCOPED_SERIALISE_CONTEXT(FRAMEBUFFER_PARAM); - Serialise_glNamedFramebufferParameteriEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, pname, param); + Serialise_glNamedFramebufferParameteriEXT(record->Resource.name, pname, param); record->AddChunk(scope.Get()); } @@ -881,7 +881,7 @@ void WrappedOpenGL::glDrawBuffers(GLsizei n, const GLenum *bufs) { SCOPED_SERIALISE_CONTEXT(DRAW_BUFFERS); if(drawrecord) - Serialise_glFramebufferDrawBuffersEXT(GetResourceManager()->GetCurrentResource(drawrecord->GetResourceID()).name, n, bufs); + Serialise_glFramebufferDrawBuffersEXT(drawrecord->Resource.name, n, bufs); else Serialise_glFramebufferDrawBuffersEXT(0, n, bufs); diff --git a/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp index ff4ac38ee..ca6bf87a2 100644 --- a/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp @@ -535,12 +535,12 @@ void WrappedOpenGL::glGenerateMipmap(GLenum target) { m_Real.glGenerateMipmap(target); - ResourceRecord *record = GetCtxData().GetActiveTexRecord(); + GLResourceRecord *record = GetCtxData().GetActiveTexRecord(); RDCASSERT(record); if(!record) return; - GLuint texture = GetResourceManager()->GetCurrentResource(record->GetResourceID()).name; + GLuint texture = record->Resource.name; if(m_State == WRITING_CAPFRAME) { @@ -859,7 +859,7 @@ void WrappedOpenGL::glTexParameteri(GLenum target, GLenum pname, GLint param) GLResourceRecord *record = GetCtxData().GetActiveTexRecord(); RDCASSERT(record); - GLResource res = GetResourceManager()->GetCurrentResource(record->GetResourceID()); + GLResource res = record->Resource; if(m_HighTrafficResources.find(res) != m_HighTrafficResources.end() && m_State != WRITING_CAPFRAME) return; @@ -945,7 +945,7 @@ void WrappedOpenGL::glTexParameteriv(GLenum target, GLenum pname, const GLint *p GLResourceRecord *record = GetCtxData().GetActiveTexRecord(); RDCASSERT(record); - GLResource res = GetResourceManager()->GetCurrentResource(record->GetResourceID()); + GLResource res = record->Resource; if(m_HighTrafficResources.find(res) != m_HighTrafficResources.end() && m_State != WRITING_CAPFRAME) return; @@ -1031,7 +1031,7 @@ void WrappedOpenGL::glTexParameterIiv(GLenum target, GLenum pname, const GLint * GLResourceRecord *record = GetCtxData().GetActiveTexRecord(); RDCASSERT(record); - GLResource res = GetResourceManager()->GetCurrentResource(record->GetResourceID()); + GLResource res = record->Resource; if(m_HighTrafficResources.find(res) != m_HighTrafficResources.end() && m_State != WRITING_CAPFRAME) return; @@ -1117,7 +1117,7 @@ void WrappedOpenGL::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint GLResourceRecord *record = GetCtxData().GetActiveTexRecord(); RDCASSERT(record); - GLResource res = GetResourceManager()->GetCurrentResource(record->GetResourceID()); + GLResource res = record->Resource; if(m_HighTrafficResources.find(res) != m_HighTrafficResources.end() && m_State != WRITING_CAPFRAME) return; @@ -1200,7 +1200,7 @@ void WrappedOpenGL::glTexParameterf(GLenum target, GLenum pname, GLfloat param) GLResourceRecord *record = GetCtxData().GetActiveTexRecord(); RDCASSERT(record); - GLResource res = GetResourceManager()->GetCurrentResource(record->GetResourceID()); + GLResource res = record->Resource; if(m_HighTrafficResources.find(res) != m_HighTrafficResources.end() && m_State != WRITING_CAPFRAME) return; @@ -1286,7 +1286,7 @@ void WrappedOpenGL::glTexParameterfv(GLenum target, GLenum pname, const GLfloat GLResourceRecord *record = GetCtxData().GetActiveTexRecord(); RDCASSERT(record); - GLResource res = GetResourceManager()->GetCurrentResource(record->GetResourceID()); + GLResource res = record->Resource; if(m_HighTrafficResources.find(res) != m_HighTrafficResources.end() && m_State != WRITING_CAPFRAME) return; @@ -1462,7 +1462,7 @@ void WrappedOpenGL::glTextureImage1DEXT(GLuint texture, GLenum target, GLint lev RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXIMAGE1D); - Serialise_glTextureImage1DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureImage1DEXT(record->Resource.name, target, level, internalformat, width, border, format, type, fromunpackbuf ? NULL : pixels); record->AddChunk(scope.Get()); @@ -1508,7 +1508,7 @@ void WrappedOpenGL::glTexImage1D(GLenum target, GLint level, GLint internalforma RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXIMAGE1D); - Serialise_glTextureImage1DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureImage1DEXT(record->Resource.name, target, level, internalformat, width, border, format, type, fromunpackbuf ? NULL : pixels); record->AddChunk(scope.Get()); @@ -1610,7 +1610,7 @@ void WrappedOpenGL::glTextureImage2DEXT(GLuint texture, GLenum target, GLint lev RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXIMAGE2D); - Serialise_glTextureImage2DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureImage2DEXT(record->Resource.name, target, level, internalformat, width, height, border, format, type, fromunpackbuf ? NULL : pixels); record->AddChunk(scope.Get()); @@ -1659,7 +1659,7 @@ void WrappedOpenGL::glTexImage2D(GLenum target, GLint level, GLint internalforma RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXIMAGE2D); - Serialise_glTextureImage2DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureImage2DEXT(record->Resource.name, target, level, internalformat, width, height, border, format, type, fromunpackbuf ? NULL : pixels); record->AddChunk(scope.Get()); @@ -1762,7 +1762,7 @@ void WrappedOpenGL::glTextureImage3DEXT(GLuint texture, GLenum target, GLint lev RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXIMAGE3D); - Serialise_glTextureImage3DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureImage3DEXT(record->Resource.name, target, level, internalformat, width, height, depth, border, format, type, fromunpackbuf ? NULL : pixels); record->AddChunk(scope.Get()); @@ -1811,7 +1811,7 @@ void WrappedOpenGL::glTexImage3D(GLenum target, GLint level, GLint internalforma RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXIMAGE3D); - Serialise_glTextureImage3DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureImage3DEXT(record->Resource.name, target, level, internalformat, width, height, depth, border, format, type, fromunpackbuf ? NULL : pixels); record->AddChunk(scope.Get()); @@ -1915,7 +1915,7 @@ void WrappedOpenGL::glCompressedTextureImage1DEXT(GLuint texture, GLenum target, RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXIMAGE1D_COMPRESSED); - Serialise_glCompressedTextureImage1DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glCompressedTextureImage1DEXT(record->Resource.name, target, level, internalformat, width, border, imageSize, fromunpackbuf ? NULL : pixels); record->AddChunk(scope.Get()); @@ -1964,7 +1964,7 @@ void WrappedOpenGL::glCompressedTexImage1D(GLenum target, GLint level, GLenum in RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXIMAGE1D_COMPRESSED); - Serialise_glCompressedTextureImage1DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glCompressedTextureImage1DEXT(record->Resource.name, target, level, internalformat, width, border, imageSize, fromunpackbuf ? NULL : pixels); record->AddChunk(scope.Get()); @@ -2069,7 +2069,7 @@ void WrappedOpenGL::glCompressedTextureImage2DEXT(GLuint texture, GLenum target, RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXIMAGE2D_COMPRESSED); - Serialise_glCompressedTextureImage2DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glCompressedTextureImage2DEXT(record->Resource.name, target, level, internalformat, width, height, border, imageSize, fromunpackbuf ? NULL : pixels); record->AddChunk(scope.Get()); @@ -2118,7 +2118,7 @@ void WrappedOpenGL::glCompressedTexImage2D(GLenum target, GLint level, GLenum in RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXIMAGE2D_COMPRESSED); - Serialise_glCompressedTextureImage2DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glCompressedTextureImage2DEXT(record->Resource.name, target, level, internalformat, width, height, border, imageSize, fromunpackbuf ? NULL : pixels); record->AddChunk(scope.Get()); @@ -2224,7 +2224,7 @@ void WrappedOpenGL::glCompressedTextureImage3DEXT(GLuint texture, GLenum target, RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXIMAGE3D); - Serialise_glCompressedTextureImage3DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glCompressedTextureImage3DEXT(record->Resource.name, target, level, internalformat, width, height, depth, border, imageSize, fromunpackbuf ? NULL : pixels); record->AddChunk(scope.Get()); @@ -2273,7 +2273,7 @@ void WrappedOpenGL::glCompressedTexImage3D(GLenum target, GLint level, GLenum in RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXIMAGE3D_COMPRESSED); - Serialise_glCompressedTextureImage3DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glCompressedTextureImage3DEXT(record->Resource.name, target, level, internalformat, width, height, depth, border, imageSize, fromunpackbuf ? NULL : pixels); record->AddChunk(scope.Get()); @@ -2376,7 +2376,7 @@ void WrappedOpenGL::glTexStorage1D(GLenum target, GLsizei levels, GLenum interna RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXSTORAGE1D); - Serialise_glTextureStorage1DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureStorage1DEXT(record->Resource.name, target, levels, internalformat, width); record->AddChunk(scope.Get()); @@ -2470,7 +2470,7 @@ void WrappedOpenGL::glTexStorage2D(GLenum target, GLsizei levels, GLenum interna RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXSTORAGE2D); - Serialise_glTextureStorage2DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureStorage2DEXT(record->Resource.name, target, levels, internalformat, width, height); record->AddChunk(scope.Get()); @@ -2565,7 +2565,7 @@ void WrappedOpenGL::glTexStorage3D(GLenum target, GLsizei levels, GLenum interna RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXSTORAGE3D); - Serialise_glTextureStorage3DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureStorage3DEXT(record->Resource.name, target, levels, internalformat, width, height, depth); record->AddChunk(scope.Get()); @@ -2662,7 +2662,7 @@ void WrappedOpenGL::glTexStorage2DMultisample(GLenum target, GLsizei samples, GL RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXSTORAGE2DMS); - Serialise_glTextureStorage2DMultisampleEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureStorage2DMultisampleEXT(record->Resource.name, target, samples, internalformat, width, height, fixedsamplelocations); record->AddChunk(scope.Get()); @@ -2703,7 +2703,7 @@ void WrappedOpenGL::glTexImage2DMultisample(GLenum target, GLsizei samples, GLen // assuming texstorage is equivalent to teximage (this is not true in the case where someone // tries to re-size an image by re-calling teximage). SCOPED_SERIALISE_CONTEXT(TEXSTORAGE2DMS); - Serialise_glTextureStorage2DMultisampleEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureStorage2DMultisampleEXT(record->Resource.name, target, samples, internalformat, width, height, fixedsamplelocations); record->AddChunk(scope.Get()); @@ -2802,7 +2802,7 @@ void WrappedOpenGL::glTexStorage3DMultisample(GLenum target, GLsizei samples, GL RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXSTORAGE3DMS); - Serialise_glTextureStorage3DMultisampleEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureStorage3DMultisampleEXT(record->Resource.name, target, samples, internalformat, width, height, depth, fixedsamplelocations); record->AddChunk(scope.Get()); @@ -2843,7 +2843,7 @@ void WrappedOpenGL::glTexImage3DMultisample(GLenum target, GLsizei samples, GLen // assuming texstorage is equivalent to teximage (this is not true in the case where someone // tries to re-size an image by re-calling teximage). SCOPED_SERIALISE_CONTEXT(TEXSTORAGE3DMS); - Serialise_glTextureStorage3DMultisampleEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureStorage3DMultisampleEXT(record->Resource.name, target, samples, internalformat, width, height, depth, fixedsamplelocations); record->AddChunk(scope.Get()); @@ -2967,7 +2967,7 @@ void WrappedOpenGL::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, G RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXSUBIMAGE1D); - Serialise_glTextureSubImage1DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureSubImage1DEXT(record->Resource.name, target, level, xoffset, width, format, type, pixels); if(m_State == WRITING_CAPFRAME) @@ -3079,7 +3079,7 @@ void WrappedOpenGL::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, G RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXSUBIMAGE2D); - Serialise_glTextureSubImage2DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureSubImage2DEXT(record->Resource.name, target, level, xoffset, yoffset, width, height, format, type, pixels); if(m_State == WRITING_CAPFRAME) @@ -3193,7 +3193,7 @@ void WrappedOpenGL::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, G RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXSUBIMAGE3D); - Serialise_glTextureSubImage3DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureSubImage3DEXT(record->Resource.name, target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); if(m_State == WRITING_CAPFRAME) @@ -3292,7 +3292,7 @@ void WrappedOpenGL::glCompressedTexSubImage1D(GLenum target, GLint level, GLint RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXSUBIMAGE1D_COMPRESSED); - Serialise_glCompressedTextureSubImage1DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glCompressedTextureSubImage1DEXT(record->Resource.name, target, level, xoffset, width, format, imageSize, pixels); if(m_State == WRITING_CAPFRAME) @@ -3393,7 +3393,7 @@ void WrappedOpenGL::glCompressedTexSubImage2D(GLenum target, GLint level, GLint RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXSUBIMAGE2D_COMPRESSED); - Serialise_glCompressedTextureSubImage2DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glCompressedTextureSubImage2DEXT(record->Resource.name, target, level, xoffset, yoffset, width, height, format, imageSize, pixels); if(m_State == WRITING_CAPFRAME) @@ -3496,7 +3496,7 @@ void WrappedOpenGL::glCompressedTexSubImage3D(GLenum target, GLint level, GLint RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXSUBIMAGE3D_COMPRESSED); - Serialise_glCompressedTextureSubImage3DEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glCompressedTextureSubImage3DEXT(record->Resource.name, target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pixels); if(m_State == WRITING_CAPFRAME) @@ -3565,7 +3565,7 @@ void WrappedOpenGL::glTexBufferRange(GLenum target, GLenum internalformat, GLuin RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXBUFFER_RANGE); - Serialise_glTextureBufferRangeEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureBufferRangeEXT(record->Resource.name, target, internalformat, buffer, offset, size); record->AddChunk(scope.Get()); @@ -3628,7 +3628,7 @@ void WrappedOpenGL::glTexBuffer(GLenum target, GLenum internalformat, GLuint buf RDCASSERT(record); SCOPED_SERIALISE_CONTEXT(TEXBUFFER); - Serialise_glTextureBufferEXT(GetResourceManager()->GetCurrentResource(record->GetResourceID()).name, + Serialise_glTextureBufferEXT(record->Resource.name, target, internalformat, buffer); record->AddChunk(scope.Get());