From 976e89787b95507b35896df45bad037bc563d61a Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 1 Dec 2014 20:57:39 +0000 Subject: [PATCH] Avoid using glGetTextureImageEXT as it might be buggy for cubemaps --- renderdoc/driver/gl/gl_manager.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/gl/gl_manager.cpp b/renderdoc/driver/gl/gl_manager.cpp index 1e387e947..f95c8cf36 100644 --- a/renderdoc/driver/gl/gl_manager.cpp +++ b/renderdoc/driver/gl/gl_manager.cpp @@ -493,6 +493,13 @@ bool GLResourceManager::Serialise_InitialState(GLResource res) byte *buf = new byte[size]; + GLenum binding = TextureBinding(t); + + GLuint prevtex = 0; + gl.glGetIntegerv(binding, (GLint *)&prevtex); + + gl.glBindTexture(t, tex); + for(int i=0; i < mips; i++) { int w = RDCMAX(details.width>>i, 1); @@ -520,13 +527,16 @@ bool GLResourceManager::Serialise_InitialState(GLResource res) for(int trg=0; trg < count; trg++) { - gl.glGetTextureImageEXT(tex, targets[trg], i, fmt, type, buf); + // we avoid glGetTextureImageEXT as it seems buggy for cubemap faces + gl.glGetTexImage(targets[trg], i, fmt, type, buf); m_pSerialiser->SerialiseBuffer("image", buf, size); } } + + gl.glBindTexture(t, prevtex); - delete[] buf; + SAFE_DELETE_ARRAY(buf); } gl.glBindBuffer(eGL_PIXEL_PACK_BUFFER, ppb);