Mesa (master): iris: Order CS stall and TC invalidate for format reinterpretation hacks

[GitLab Mirror]

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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Jun 17 06:55:07 2019 -0500

iris: Order CS stall and TC invalidate for format reinterpretation hacks

This should ensure the TC invalidate happens after the stall.

Fixes KHR-GL43.copy_image.functional which does a CopyImage (blorp_copy)
from a buffer (using R8G8B8A8_UINT), then GetTexImage to read back the
original image (using R10G10B10A2_UNORM).

---

 src/gallium/drivers/iris/iris_blit.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_blit.c b/src/gallium/drivers/iris/iris_blit.c
index 5861c965c06..95209cb408f 100644
--- a/src/gallium/drivers/iris/iris_blit.c
+++ b/src/gallium/drivers/iris/iris_blit.c
@@ -289,9 +289,8 @@ tex_cache_flush_hack(struct iris_batch *batch)
     *
     * TODO: Remove this hack!
     */
-   iris_emit_pipe_control_flush(batch,
-                                PIPE_CONTROL_CS_STALL |
-                                PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE);
+   iris_emit_pipe_control_flush(batch, PIPE_CONTROL_CS_STALL);
+   iris_emit_pipe_control_flush(batch, PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE);
 }
 
 /**