From 177110ae3261e6ba91a40ed1c495a865edbe9394 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sun, 31 Jul 2011 21:00:55 -0700 Subject: [PATCH] mesa: Update comments/assertions about buffer mapping for glGetTexImage(). This code is about to stop needing ->Data and using MapTextureImage(). Tested-by: Brian Paul --- src/mesa/main/texgetimage.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c index 4d583094312..a5e499a531e 100644 --- a/src/mesa/main/texgetimage.c +++ b/src/mesa/main/texgetimage.c @@ -409,7 +409,8 @@ get_tex_memcpy(struct gl_context *ctx, GLenum format, GLenum type, GLvoid *pixel /** * This is the software fallback for Driver.GetTexImage(). * All error checking will have been done before this routine is called. - * The texture image must be mapped. + * We'll call ctx->Driver.MapTextureImage() to access the data, then + * unmap with ctx->Driver.UnmapTextureImage(). */ void _mesa_get_teximage(struct gl_context *ctx, GLenum target, GLint level, @@ -419,9 +420,6 @@ _mesa_get_teximage(struct gl_context *ctx, GLenum target, GLint level, { GLuint dimensions; - /* If we get here, the texture image should be mapped */ - assert(texImage->Data); - switch (target) { case GL_TEXTURE_1D: dimensions = 1; @@ -433,6 +431,7 @@ _mesa_get_teximage(struct gl_context *ctx, GLenum target, GLint level, dimensions = 2; } + /* map dest buffer, if PBO */ if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) { /* Packing texture image into a PBO. * Map the (potentially) VRAM-based buffer into our process space so -- 2.30.2