summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorChris Forbes <[email protected]>2014-01-20 20:01:35 +1300
committerChris Forbes <[email protected]>2014-04-10 18:27:41 +1200
commitca1d1b2fc1d1f7fb5dbbc0719c6c899b97bc9e6b (patch)
tree39192091c0b2573ba9dc46789315af7751dc0c17 /src/mesa/drivers
parentc9c08867ed07ceb10b67ffac5f0a33812710a5e8 (diff)
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 <[email protected]> Reviewed-by: Ian Romanick <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Acked-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/i965/intel_tex_subimage.c4
1 files changed, 4 insertions, 0 deletions
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);