<div dir="ltr"><div>I couldn't get your patches to apply on top of master. Can you rebase your v2 on top of master? Or can you send a link to your repo so I can cherry-pick the commits? </div></div><div class="gmail_extra"> <div class="gmail_quote">On Wed, Dec 17, 2014 at 11:40 AM, Brian Paul <<a href="mailto:brianp@vmware.com" target="_blank">brianp@vmware.com</a>> wrote:<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On 12/16/2014 12:56 PM, Laura Ekstrand wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> On Sat, Dec 13, 2014 at 6:42 AM, Brian Paul <<a href="mailto:brianp@vmware.com" target="_blank">brianp@vmware.com</a> <div><div class="h5"> <mailto:<a href="mailto:brianp@vmware.com" target="_blank">brianp@vmware.com</a>>> wrote: In preparation for getting texture sub images. --- src/mesa/drivers/common/meta.c | 88 +++++++++++++++++--------- src/mesa/drivers/common/meta.h | 4 ++ src/mesa/drivers/common/meta_generate_mipmap.c | 4 +- 3 files changed, 64 insertions(+), 32 deletions(-) diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 87532c1..a84e512 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -2450,30 +2450,53 @@ _mesa_meta_Bitmap(struct gl_context *ctx, /** * Compute the texture coordinates for the four vertices of a quad for - * drawing a 2D texture image or slice of a cube/3D texture. + * drawing a 2D texture image or slice of a cube/3D texture. The offset + * and width, height specify a sub-region of the 2D image. + * * \param faceTarget GL_TEXTURE_1D/2D/3D or cube face name * \param slice slice of a 1D/2D array texture or 3D texture - * \param width width of the texture image - * \param height height of the texture image + * \param xoffset X position of sub texture + * \param yoffset Y position of sub texture + * \param width width of the sub texture image + * \param height height of the sub texture image + * \param total_width total width of the texture image + * \param total_height total height of the texture image + * \param total_depth total depth of the texture image * \param coords0/1/2/3 returns the computed texcoords */ I'm confused. Here you take the args width, height, then total_width, total_height, and total_depth. But in the definition of _mesa_meta_setup_texture_coords in meta.h, you have width, height, depth, total_width, and total_height. </div></div></blockquote> Typo. I've fixed the meta.h declaration. -Brian </blockquote></div></div>