Mesa (staging/19.1): iris: Fix iris_flush_and_dirty_history to actually dirty history.

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: 25a34df61439b25645d03510d6354cb1f5e8a185
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=25a34df61439b25645d03510d6354cb1f5e8a185

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Wed Jun 19 23:08:25 2019 -0500

iris: Fix iris_flush_and_dirty_history to actually dirty history.

When I split iris_flush_and_dirty_history into two helper functions,
I accidentally made it stop dirtying.  Which was...sort of the point.

Fixes: 21688a306b2 iris: Split iris_flush_and_dirty_for_history into two helpers.
(cherry picked from commit 64fb20ed326fa0e524582225faaa4bb28f6e4349)
[Juan A. Suarez: resoved trivial conflicts]
Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>

Conflicts:
	src/gallium/drivers/iris/iris_resource.c

---

 src/gallium/drivers/iris/iris_resource.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
index fd50139defc..3770c96d6f2 100644
--- a/src/gallium/drivers/iris/iris_resource.c
+++ b/src/gallium/drivers/iris/iris_resource.c
@@ -1586,6 +1586,8 @@ iris_flush_and_dirty_for_history(struct iris_context *ice,
       flush |= PIPE_CONTROL_RENDER_TARGET_FLUSH;
 
    iris_emit_pipe_control_flush(batch, flush);
+
+   iris_dirty_for_history(ice, res);
 }
 
 bool