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 13:59:33 +0100
commit05cf9489898b38706f847faa2e3fb786f6a782a6 (patch)
tree196ec83ec0aa850f5a281a0023f70bec356657c3
parenta50ff5dffcf1734daf58eb34c68f106602dc49a9 (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 32c9139ef7..7fbd1c2a19 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -2136,7 +2136,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;
}