From 3dbb49a97809cd3a9911d2782bb7b03f8ae1a7d8 Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Tue, 27 Mar 2018 15:46:49 -0700 Subject: [PATCH] i965/miptree: Move the clear color and value setter implementations These will get more complex in later commits. Reviewed-by: Topi Pohjolainen Reviewed-by: Jason Ekstrand --- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 26 +++++++++++++++++++ src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 25 +++--------------- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index 89074a64930..32be4b033eb 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -3804,3 +3804,29 @@ intel_miptree_get_aux_isl_usage(const struct brw_context *brw, return mt->aux_usage; } + +bool +intel_miptree_set_clear_color(struct brw_context *brw, + struct intel_mipmap_tree *mt, + union isl_color_value clear_color) +{ + if (memcmp(&mt->fast_clear_color, &clear_color, sizeof(clear_color)) != 0) { + mt->fast_clear_color = clear_color; + brw->ctx.NewDriverState |= BRW_NEW_AUX_STATE; + return true; + } + return false; +} + +bool +intel_miptree_set_depth_clear_value(struct brw_context *brw, + struct intel_mipmap_tree *mt, + float clear_value) +{ + if (mt->fast_clear_color.f32[0] != clear_value) { + mt->fast_clear_color.f32[0] = clear_value; + brw->ctx.NewDriverState |= BRW_NEW_AUX_STATE; + return true; + } + return false; +} diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h index df9b76892ac..ff6ce4ecf9e 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h @@ -731,32 +731,15 @@ bool intel_miptree_sample_with_hiz(struct brw_context *brw, struct intel_mipmap_tree *mt); - -static inline bool +bool intel_miptree_set_clear_color(struct brw_context *brw, struct intel_mipmap_tree *mt, - union isl_color_value clear_color) -{ - if (memcmp(&mt->fast_clear_color, &clear_color, sizeof(clear_color)) != 0) { - mt->fast_clear_color = clear_color; - brw->ctx.NewDriverState |= BRW_NEW_AUX_STATE; - return true; - } - return false; -} + union isl_color_value clear_color); -static inline bool +bool intel_miptree_set_depth_clear_value(struct brw_context *brw, struct intel_mipmap_tree *mt, - float clear_value) -{ - if (mt->fast_clear_color.f32[0] != clear_value) { - mt->fast_clear_color.f32[0] = clear_value; - brw->ctx.NewDriverState |= BRW_NEW_AUX_STATE; - return true; - } - return false; -} + float clear_value); #ifdef __cplusplus } -- 2.30.2