i965: Enable texture upload fast path with MinLevel

We'll still avoid MinLayer here since the fast path doesn't understand
arrays at all, but it's straightforward to do levels.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mesa/drivers/dri/i965/intel_tex_subimage.c b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
index 287b27b02a17350e2d5bed38e2be2f0df0c2dfd0..891a46d198fa571801cf77fef24d89d9ccf467f3 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
@@ -589,7 +589,7 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
       return false;
 
    /* If this is a nontrivial texture view, let another path handle it instead. */
-   if (texImage->TexObject->MinLevel || texImage->TexObject->MinLayer)
+   if (texImage->TexObject->MinLayer)
       return false;
 
    if (for_glTexImage)