From: Chris Forbes <chrisf@ijw.co.nz>
Date: Mon, 20 Jan 2014 07:01:35 +0000 (+1300)
Subject: i965: Don't try to use fast upload path for nontrivial views
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ca1d1b2fc1d1f7fb5dbbc0719c6c899b97bc9e6b;p=mesa.git

i965: Don't try to use fast upload path for nontrivial views

This will eventually be relaxed, but we'll get the fallback path
working first.

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 b65a7720af5..7143ab79688 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
@@ -588,6 +588,10 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
    if (!mem_copy)
       return false;
 
+   /* If this is a nontrivial texture view, let another path handle it instead. */
+   if (texImage->TexObject->MinLevel || texImage->TexObject->MinLayer)
+      return false;
+
    if (for_glTexImage)
       ctx->Driver.AllocTextureImageBuffer(ctx, texImage);