X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace%2Fglstate_images.cpp;h=ad60486b5b2891619b339fbe7bc8c59c35f72a09;hb=HEAD;hp=7b0a42473fdf97cbc8c04ad4910247d078d4b2cf;hpb=6083cfc0885f162b532825b23639f0ec2fe285c2;p=apitrace diff --git a/retrace/glstate_images.cpp b/retrace/glstate_images.cpp index 7b0a424..ad60486 100644 --- a/retrace/glstate_images.cpp +++ b/retrace/glstate_images.cpp @@ -287,31 +287,52 @@ getActiveTextureLevelDesc(Context &context, GLenum target, GLint level, ImageDes } -/** - * OpenGL ES does not support glGetTexImage. Obtain the pixels by attaching the - * texture to a framebuffer. - */ -static inline void -getTexImageOES(GLenum target, GLint level, ImageDesc &desc, GLubyte *pixels) +static GLenum +getTextureBinding(GLenum target) { - memset(pixels, 0x80, desc.height * desc.width * 4); - - GLenum texture_binding = GL_NONE; switch (target) { + case GL_TEXTURE_1D: + return GL_TEXTURE_BINDING_1D; + case GL_TEXTURE_1D_ARRAY: + return GL_TEXTURE_BINDING_1D_ARRAY; case GL_TEXTURE_2D: - texture_binding = GL_TEXTURE_BINDING_2D; - break; + return GL_TEXTURE_BINDING_2D; + case GL_TEXTURE_2D_MULTISAMPLE: + return GL_TEXTURE_BINDING_2D_MULTISAMPLE; + case GL_TEXTURE_2D_ARRAY: + return GL_TEXTURE_BINDING_2D_ARRAY; + case GL_TEXTURE_RECTANGLE: + return GL_TEXTURE_BINDING_RECTANGLE; + case GL_TEXTURE_CUBE_MAP: case GL_TEXTURE_CUBE_MAP_POSITIVE_X: case GL_TEXTURE_CUBE_MAP_NEGATIVE_X: case GL_TEXTURE_CUBE_MAP_POSITIVE_Y: case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y: case GL_TEXTURE_CUBE_MAP_POSITIVE_Z: case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z: - texture_binding = GL_TEXTURE_BINDING_CUBE_MAP; - break; - case GL_TEXTURE_3D_OES: - texture_binding = GL_TEXTURE_BINDING_3D_OES; + return GL_TEXTURE_BINDING_CUBE_MAP; + case GL_TEXTURE_CUBE_MAP_ARRAY: + return GL_TEXTURE_BINDING_CUBE_MAP_ARRAY; + case GL_TEXTURE_3D: + return GL_TEXTURE_BINDING_3D; default: + assert(false); + return GL_NONE; + } +} + + +/** + * OpenGL ES does not support glGetTexImage. Obtain the pixels by attaching the + * texture to a framebuffer. + */ +static inline void +getTexImageOES(GLenum target, GLint level, ImageDesc &desc, GLubyte *pixels) +{ + memset(pixels, 0x80, desc.height * desc.width * 4); + + GLenum texture_binding = getTextureBinding(target); + if (texture_binding == GL_NONE) { return; } @@ -597,57 +618,55 @@ getDrawableBounds(GLint *width, GLint *height) { } -static const GLenum texture_bindings[][2] = { - {GL_TEXTURE_1D, GL_TEXTURE_BINDING_1D}, - {GL_TEXTURE_2D, GL_TEXTURE_BINDING_2D}, - {GL_TEXTURE_3D, GL_TEXTURE_BINDING_3D}, - {GL_TEXTURE_RECTANGLE, GL_TEXTURE_BINDING_RECTANGLE}, - {GL_TEXTURE_CUBE_MAP, GL_TEXTURE_BINDING_CUBE_MAP} +struct TextureTargetBinding +{ + GLenum target; + GLenum binding; }; -static bool -bindTexture(GLint texture, GLenum &target, GLint &bound_texture) -{ +static const GLenum +textureTargets[] = { + GL_TEXTURE_1D, + GL_TEXTURE_2D, + GL_TEXTURE_RECTANGLE, + GL_TEXTURE_CUBE_MAP, + GL_TEXTURE_3D, + GL_TEXTURE_2D_MULTISAMPLE, + GL_TEXTURE_1D_ARRAY, + GL_TEXTURE_2D_ARRAY, + GL_TEXTURE_CUBE_MAP_ARRAY, +}; - for (unsigned i = 0; i < sizeof(texture_bindings)/sizeof(texture_bindings[0]); ++i) { - target = texture_bindings[i][0]; - GLenum binding = texture_bindings[i][1]; +static GLenum +getTextureTarget(GLint texture) +{ + if (!glIsTexture(texture)) { + return GL_NONE; + } + + for (unsigned i = 0; i < sizeof(textureTargets)/sizeof(textureTargets[0]); ++i) { + GLenum target = textureTargets[i]; + GLenum binding = getTextureBinding(target); while (glGetError() != GL_NO_ERROR) ; + GLint bound_texture = 0; glGetIntegerv(binding, &bound_texture); glBindTexture(target, texture); - if (glGetError() == GL_NO_ERROR) { - return true; - } + bool succeeded = glGetError() == GL_NO_ERROR; glBindTexture(target, bound_texture); - } - - target = GL_NONE; - return false; -} - - -static bool -getTextureLevelDesc(Context &context, GLint texture, GLint level, ImageDesc &desc) -{ - GLenum target; - GLint bound_texture = 0; - if (!bindTexture(texture, target, bound_texture)) { - return false; + if (succeeded) { + return target; + } } - getActiveTextureLevelDesc(context, target, level, desc); - - glBindTexture(target, bound_texture); - - return desc.valid(); + return GL_NONE; } @@ -701,11 +720,32 @@ getFramebufferAttachmentDesc(Context &context, GLenum target, GLenum attachment, if (object_type == GL_RENDERBUFFER) { return getRenderbufferDesc(context, object_name, desc); } else if (object_type == GL_TEXTURE) { + GLint texture_face = 0; + glGetFramebufferAttachmentParameteriv(target, attachment, + GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE, + &texture_face); + GLint texture_level = 0; glGetFramebufferAttachmentParameteriv(target, attachment, GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL, &texture_level); - return getTextureLevelDesc(context, object_name, texture_level, desc); + + GLint bound_texture = 0; + if (texture_face != 0) { + glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &bound_texture); + glBindTexture(GL_TEXTURE_CUBE_MAP, object_name); + getActiveTextureLevelDesc(context, texture_face, texture_level, desc); + glBindTexture(GL_TEXTURE_CUBE_MAP, bound_texture); + } else { + GLenum texture_target = getTextureTarget(object_name); + GLenum texture_binding = getTextureBinding(texture_target); + glGetIntegerv(texture_binding, &bound_texture); + glBindTexture(texture_target, object_name); + getActiveTextureLevelDesc(context, texture_target, texture_level, desc); + glBindTexture(texture_target, bound_texture); + } + + return desc.valid(); } else { std::cerr << "warning: unexpected GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE = " << object_type << "\n"; return false; @@ -745,13 +785,22 @@ getDrawBufferImage() { if (draw_buffer == GL_NONE) { return NULL; } + } else { + // GL_COLOR_ATTACHMENT0 is implied + draw_buffer = GL_COLOR_ATTACHMENT0; } if (!getFramebufferAttachmentDesc(context, framebuffer_target, draw_buffer, desc)) { return NULL; } } else { - if (!context.ES) { + if (context.ES) { + // XXX: Draw buffer is always FRONT for single buffer context, BACK + // for double buffered contexts. There is no way to know which (as + // GL_DOUBLEBUFFER state is also unavailable), so always assume + // double-buffering. + draw_buffer = GL_BACK; + } else { glGetIntegerv(GL_DRAW_BUFFER, &draw_buffer); if (draw_buffer == GL_NONE) { return NULL; @@ -968,16 +1017,21 @@ dumpDrawableImages(JSONWriter &json, Context &context) GLint draw_buffer = GL_NONE; if (context.ES) { + // XXX: Draw buffer is always FRONT for single buffer context, BACK for + // double buffered contexts. There is no way to know which (as + // GL_DOUBLEBUFFER state is also unavailable), so always assume + // double-buffering. draw_buffer = GL_BACK; } else { glGetIntegerv(GL_DRAW_BUFFER, &draw_buffer); - glReadBuffer(draw_buffer); } if (draw_buffer != GL_NONE) { + // Read from current draw buffer GLint read_buffer = GL_NONE; if (!context.ES) { glGetIntegerv(GL_READ_BUFFER, &read_buffer); + glReadBuffer(draw_buffer); } GLint alpha_bits = 0; @@ -990,6 +1044,7 @@ dumpDrawableImages(JSONWriter &json, Context &context) dumpReadBufferImage(json, width, height, format); json.endMember(); + // Restore original read buffer if (!context.ES) { glReadBuffer(read_buffer); }