summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2016-11-15 18:40:42 -0800
committerBen Widawsky <ben@bwidawsk.net>2017-03-13 10:37:38 -0700
commita0ba04ce015fa0464e82ce36440c8f2001801d77 (patch)
treed8b204d7a85315f5b65bfaacb9d02a91c1d8472b
parent574d4d44f8b0eb3345ec9b536c81411caa2fb374 (diff)
i965: Plumb resolve hints from miptrees to blorp
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Acked-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
-rw-r--r--src/mesa/drivers/dri/i965/brw_blorp.c3
-rw-r--r--src/mesa/drivers/dri/i965/brw_blorp.h3
-rw-r--r--src/mesa/drivers/dri/i965/intel_mipmap_tree.c4
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 469329d6e8..7888831219 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 6688bbb7ca..92f805f781 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -2371,7 +2371,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;
}
@@ -2392,7 +2392,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);
}
}