summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2016-05-01 15:29:52 +0200
committerEmil Velikov <emil.l.velikov@gmail.com>2016-05-05 11:47:53 +0100
commit3a0118e3a4b763cc0ba23597ba4303c326ed83e4 (patch)
tree74220b1500c4a222291ed8c8cf28654b0d264659
parent7140f9586046823c392b8d4c59874a121172f7be (diff)
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> (cherry picked from commit 3d956b4bc0b346a6dff23bfe56c6b5ae1ec1ddaa)
-rw-r--r--src/mesa/state_tracker/st_cb_texture.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index daebdfad82d..ba2cac05413 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -943,7 +943,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;
}