From: Rob Bradford <r...@linux.intel.com>
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.
Signed-off-by: Rob Bradford <r...@linux.intel.com>
Reviewed-by: Chad Versace <chad.vers...@linux.intel.com>
---
src/mesa/drivers/dri/intel/intel_tex_subimage.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/intel/intel_tex_subimage.c
b/src/mesa/drivers/dri/intel/intel_tex_subimage.c
index 55d0bae..ba6267a 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)
--
1.7.11.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
