From ca1d1b2fc1d1f7fb5dbbc0719c6c899b97bc9e6b Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Mon, 20 Jan 2014 20:01:35 +1300 Subject: [PATCH] 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 Reviewed-by: Ian Romanick Reviewed-by: Kenneth Graunke Acked-by: Eric Anholt --- src/mesa/drivers/dri/i965/intel_tex_subimage.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mesa/drivers/dri/i965/intel_tex_subimage.c b/src/mesa/drivers/dri/i965/intel_tex_subimage.c index b65a772..7143ab7 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); -- 2.7.4