From df4c2ec5e19be14f61b6ef083de47abda02f0d8c Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 17 Jul 2019 13:43:04 -0700 Subject: [PATCH] iris: Make iris_has_color_unresolved non-static We want to use this in the transfer code and possibly for fast clears. --- src/gallium/drivers/iris/iris_resolve.c | 12 ++++++------ src/gallium/drivers/iris/iris_resource.h | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c index d80b126c21b..87c9d64561f 100644 --- a/src/gallium/drivers/iris/iris_resolve.c +++ b/src/gallium/drivers/iris/iris_resolve.c @@ -722,10 +722,10 @@ miptree_layer_range_length(const struct iris_resource *res, uint32_t level, return num_layers; } -static bool -has_color_unresolved(const struct iris_resource *res, - unsigned start_level, unsigned num_levels, - unsigned start_layer, unsigned num_layers) +bool +iris_has_color_unresolved(const struct iris_resource *res, + unsigned start_level, unsigned num_levels, + unsigned start_layer, unsigned num_layers) { if (!res->aux.bo) return false; @@ -1323,8 +1323,8 @@ iris_resource_texture_aux_usage(struct iris_context *ice, * ISL_AUX_USAGE_NONE. This way, texturing won't even look at the * aux surface and we can save some bandwidth. */ - if (!has_color_unresolved(res, 0, INTEL_REMAINING_LEVELS, - 0, INTEL_REMAINING_LAYERS)) + if (!iris_has_color_unresolved(res, 0, INTEL_REMAINING_LEVELS, + 0, INTEL_REMAINING_LAYERS)) return ISL_AUX_USAGE_NONE; if (can_texture_with_ccs(devinfo, &ice->dbg, res, view_format)) diff --git a/src/gallium/drivers/iris/iris_resource.h b/src/gallium/drivers/iris/iris_resource.h index 75f04d492d9..45e00ede7e9 100644 --- a/src/gallium/drivers/iris/iris_resource.h +++ b/src/gallium/drivers/iris/iris_resource.h @@ -407,6 +407,10 @@ void iris_resource_prepare_image(struct iris_context *ice, struct iris_batch *batch, struct iris_resource *res); +bool iris_has_color_unresolved(const struct iris_resource *res, + unsigned start_level, unsigned num_levels, + unsigned start_layer, unsigned num_layers); + void iris_resource_check_level_layer(const struct iris_resource *res, uint32_t level, uint32_t layer); -- 2.30.2