From: Rob Bradford Date: Tue, 2 Oct 2012 13:18:39 +0000 (+0100) Subject: intel: Fix intel_texsubimage_tiled_memcpy to skip GL_EXT_unpack_subimage case X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=185d6df3c10a7ff5defe163af614bfc41088910b;p=mesa.git intel: Fix intel_texsubimage_tiled_memcpy to skip GL_EXT_unpack_subimage case 413c49141 added an optimisation to improve the performance of teximage under a limited set of circumstances. If GL_EXT_unpack_subimage has been used then we we must also skip this optimisation since the optimised codepath does not take the packing values into consideration. Reviewed-by: Chad Versace --- diff --git a/src/mesa/drivers/dri/intel/intel_tex_subimage.c b/src/mesa/drivers/dri/intel/intel_tex_subimage.c index 55d0bae2737..ba6267a32de 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_subimage.c +++ b/src/mesa/drivers/dri/intel/intel_tex_subimage.c @@ -205,7 +205,10 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx, texImage->TexObject->Target != GL_TEXTURE_2D || texImage->Level != 0 || pixels == NULL || - packing->Alignment > 4) + packing->Alignment > 4 || + packing->SkipPixels > 0 || + packing->SkipRows > 0 || + packing->RowLength != width) return false; if (for_glTexImage)