From: Marek Olšák <marek.olsak@amd.com>
Date: Sun, 1 May 2016 13:29:52 +0000 (+0200)
Subject: st/mesa: fix blit-based GetTexImage for non-finalized textures
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d956b4bc0b346a6dff23bfe56c6b5ae1ec1ddaa;p=mesa.git

st/mesa: fix blit-based GetTexImage for non-finalized textures

This fixes getteximage-depth piglit failures on radeonsi.

Cc: 11.1 11.2 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index aa073b0c781..f1812665065 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -2137,7 +2137,8 @@ st_GetTexSubImage(struct gl_context * ctx,
       goto fallback;
    }
 
-   if (!stImage->pt || !src) {
+   /* Handle non-finalized textures. */
+   if (!stImage->pt || stImage->pt != stObj->pt || !src) {
       goto fallback;
    }