Mesa (master): st/mesa: fix blit-based GetTexImage for non-finalized textures

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 3d956b4bc0b346a6dff23bfe56c6b5ae1ec1ddaa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d956b4bc0b346a6dff23bfe56c6b5ae1ec1ddaa

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sun May  1 15:29:52 2016 +0200

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 at lists.freedesktop.org>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/mesa/state_tracker/st_cb_texture.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index aa073b0..f181266 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;
    }