diff options
Diffstat (limited to 'mesalib/src/mesa/drivers/common')
| -rw-r--r-- | mesalib/src/mesa/drivers/common/meta.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c index 0cf1028c4..6c8495ddb 100644 --- a/mesalib/src/mesa/drivers/common/meta.c +++ b/mesalib/src/mesa/drivers/common/meta.c @@ -3244,7 +3244,7 @@ decompress_texture_image(struct gl_context *ctx, struct gl_texture_image *texImage, GLuint slice, GLenum destFormat, GLenum destType, - GLvoid *dest, GLint destRowLength) + GLvoid *dest) { struct decompress_state *decompress = &ctx->Meta->Decompress; struct gl_texture_object *texObj = texImage->TexObject; @@ -3274,7 +3274,7 @@ decompress_texture_image(struct gl_context *ctx, fboDrawSave = ctx->DrawBuffer->Name; fboReadSave = ctx->ReadBuffer->Name; - _mesa_meta_begin(ctx, MESA_META_ALL); + _mesa_meta_begin(ctx, MESA_META_ALL & ~MESA_META_PIXEL_STORE); /* Create/bind FBO/renderbuffer */ if (decompress->FBO == 0) { @@ -3292,7 +3292,7 @@ decompress_texture_image(struct gl_context *ctx, } /* alloc dest surface */ - if (width != decompress->Width || height != decompress->Height) { + if (width > decompress->Width || height > decompress->Height) { _mesa_RenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA, width, height); decompress->Width = width; @@ -3409,7 +3409,6 @@ decompress_texture_image(struct gl_context *ctx, _mesa_PixelTransferf(GL_BLUE_SCALE, 0.0f); } - ctx->Pack.RowLength = destRowLength; _mesa_ReadPixels(0, 0, width, height, destFormat, destType, dest); } @@ -3450,8 +3449,7 @@ _mesa_meta_GetTexImage(struct gl_context *ctx, const GLuint slice = 0; /* only 2D compressed textures for now */ /* Need to unlock the texture here to prevent deadlock... */ _mesa_unlock_texture(ctx, texObj); - decompress_texture_image(ctx, texImage, slice, format, type, pixels, - ctx->Pack.RowLength); + decompress_texture_image(ctx, texImage, slice, format, type, pixels); /* ... and relock it */ _mesa_lock_texture(ctx, texObj); } |