summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2015-07-21 18:35:38 -0600
committerBrian Paul <brianp@vmware.com>2015-07-21 18:35:38 -0600
commit096371879098c315bc054b6fe1ef6f4b8f18554f (patch)
treedc209e2886565527068fd62c092a19e649eca17d
parent2a2c9469425bc794c98dcf57237457ba41d10ce2 (diff)
meta: add offset, width, height parameters to decompress_texture_image()
In preparation for decompressing texture sub images. Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
-rw-r--r--src/mesa/drivers/common/meta.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 54c3d5ac66e..34a8e4b9d9a 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -2966,15 +2966,14 @@ static bool
decompress_texture_image(struct gl_context *ctx,
struct gl_texture_image *texImage,
GLuint slice,
+ GLint xoffset, GLint yoffset,
+ GLsizei width, GLsizei height,
GLenum destFormat, GLenum destType,
GLvoid *dest)
{
struct decompress_state *decompress = &ctx->Meta->Decompress;
struct decompress_fbo_state *decompress_fbo;
struct gl_texture_object *texObj = texImage->TexObject;
- const GLint width = texImage->Width;
- const GLint height = texImage->Height;
- const GLint depth = texImage->Height;
const GLenum target = texObj->Target;
GLenum rbFormat;
GLenum faceTarget;
@@ -3093,7 +3092,7 @@ decompress_texture_image(struct gl_context *ctx,
memset(verts, 0, sizeof(verts));
_mesa_meta_setup_texture_coords(faceTarget, slice,
- 0, 0, width, height,
+ xoffset, yoffset, width, height,
texImage->Width, texImage->Height,
texImage->Depth,
verts[0].tex,
@@ -3224,7 +3223,8 @@ _mesa_meta_GetTexImage(struct gl_context *ctx,
else {
dst = pixels;
}
- result = decompress_texture_image(ctx, texImage, slice,
+ result = decompress_texture_image(ctx, texImage, slice, 0, 0,
+ texImage->Width, texImage->Height,
format, type, dst);
if (!result)
break;