From ea1399aba07bfef728f43857643377c5842c1978 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 30 Aug 2016 16:55:35 -0700 Subject: [PATCH] intel/blorp: Make color_write_disable const and optional Signed-off-by: Jason Ekstrand Reviewed-by: Topi Pohjolainen --- src/intel/blorp/blorp.h | 2 +- src/intel/blorp/blorp_clear.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/intel/blorp/blorp.h b/src/intel/blorp/blorp.h index 0848d45c80a..72cac202162 100644 --- a/src/intel/blorp/blorp.h +++ b/src/intel/blorp/blorp.h @@ -130,7 +130,7 @@ blorp_clear(struct blorp_batch *batch, uint32_t level, uint32_t start_layer, uint32_t num_layers, uint32_t x0, uint32_t y0, uint32_t x1, uint32_t y1, enum isl_format format, union isl_color_value clear_color, - bool color_write_disable[4]); + const bool color_write_disable[4]); void blorp_ccs_resolve(struct blorp_batch *batch, diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c index 384a4cf9877..d16933cc6fc 100644 --- a/src/intel/blorp/blorp_clear.c +++ b/src/intel/blorp/blorp_clear.c @@ -245,7 +245,7 @@ blorp_clear(struct blorp_batch *batch, uint32_t level, uint32_t start_layer, uint32_t num_layers, uint32_t x0, uint32_t y0, uint32_t x1, uint32_t y1, enum isl_format format, union isl_color_value clear_color, - bool color_write_disable[4]) + const bool color_write_disable[4]) { struct blorp_params params; blorp_params_init(¶ms); @@ -276,10 +276,12 @@ blorp_clear(struct blorp_batch *batch, /* Constant color writes ignore everyting in blend and color calculator * state. This is not documented. */ - for (unsigned i = 0; i < 4; i++) { - params.color_write_disable[i] = color_write_disable[i]; - if (color_write_disable[i]) - use_simd16_replicated_data = false; + if (color_write_disable) { + for (unsigned i = 0; i < 4; i++) { + params.color_write_disable[i] = color_write_disable[i]; + if (color_write_disable[i]) + use_simd16_replicated_data = false; + } } blorp_params_get_clear_kernel(batch->blorp, ¶ms, -- 2.30.2