[Mesa-dev] [PATCH 29/34] i965: Plumb resolve hints from miptrees to blorp

[Ben Widawsky]

Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
Acked-by: Daniel Stone <daniels at collabora.com>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
---
 src/mesa/drivers/dri/i965/brw_blorp.c         | 3 ++-
 src/mesa/drivers/dri/i965/brw_blorp.h         | 3 ++-
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c
index 492b04c954..965a87c486 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.c
+++ b/src/mesa/drivers/dri/i965/brw_blorp.c
@@ -954,7 +954,8 @@ brw_blorp_clear_color(struct brw_context *brw, struct gl_framebuffer *fb,
 
 void
 brw_blorp_resolve_color(struct brw_context *brw, struct intel_mipmap_tree *mt,
-                        unsigned level, unsigned layer)
+                        unsigned level, unsigned layer,
+                        enum intel_resolve_hint hint)
 {
    DBG("%s to mt %p level %u layer %u\n", __FUNCTION__, mt, level, layer);
 
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/i965/brw_blorp.h
index 277b00ebc2..8a8e0fc741 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.h
+++ b/src/mesa/drivers/dri/i965/brw_blorp.h
@@ -65,7 +65,8 @@ brw_blorp_clear_color(struct brw_context *brw, struct gl_framebuffer *fb,
 void
 brw_blorp_resolve_color(struct brw_context *brw,
                         struct intel_mipmap_tree *mt,
-                        unsigned level, unsigned layer);
+                        unsigned level, unsigned layer,
+                        enum intel_resolve_hint hint);
 
 void
 intel_hiz_exec(struct brw_context *brw, struct intel_mipmap_tree *mt,
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index c71a9f9e9d..217e80ae31 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -2367,7 +2367,7 @@ intel_miptree_resolve_color(struct brw_context *brw,
       if (item) {
          assert(item->fast_clear_state != INTEL_FAST_CLEAR_STATE_RESOLVED);
 
-         brw_blorp_resolve_color(brw, mt, level, start_layer);
+         brw_blorp_resolve_color(brw, mt, level, start_layer, hint);
          intel_resolve_map_remove(item);
          resolved = true;
       }
@@ -2388,7 +2388,7 @@ intel_miptree_all_slices_resolve_color(struct brw_context *brw,
                            &mt->color_resolve_map) {
       assert(map->fast_clear_state != INTEL_FAST_CLEAR_STATE_RESOLVED);
 
-      brw_blorp_resolve_color(brw, mt, map->level, map->layer);
+      brw_blorp_resolve_color(brw, mt, map->level, map->layer, hint);
       intel_resolve_map_remove(map);
    }
 }
-- 
2.11.0