Mesa (master): iris: Use texture preparation helper in iris_blit

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 51d26e2edf8e7e03b4379004fe95d3fc1185845e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=51d26e2edf8e7e03b4379004fe95d3fc1185845e

Author: Nanley Chery <nanley.g.chery at intel.com>
Date:   Mon Jan  4 09:39:23 2021 -0800

iris: Use texture preparation helper in iris_blit

Use iris_resource_prepare_texture in iris_blit to avoid partial resolves
for sRGB <-> linear texture views. This affects a trace of L4D2.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8340>

---

 src/gallium/drivers/iris/iris_blit.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_blit.c b/src/gallium/drivers/iris/iris_blit.c
index 1643e607959..e3c12f0c6c0 100644
--- a/src/gallium/drivers/iris/iris_blit.c
+++ b/src/gallium/drivers/iris/iris_blit.c
@@ -410,12 +410,8 @@ iris_blit(struct pipe_context *ctx, const struct pipe_blit_info *info)
    enum isl_aux_usage src_aux_usage =
       iris_resource_texture_aux_usage(ice, src_res, src_fmt.fmt);
 
-   bool src_clear_supported = isl_aux_usage_has_fast_clears(src_aux_usage) &&
-                              src_res->surf.format == src_fmt.fmt;
-
-   iris_resource_prepare_access(ice, src_res, info->src.level, 1,
-                                info->src.box.z, info->src.box.depth,
-                                src_aux_usage, src_clear_supported);
+   iris_resource_prepare_texture(ice, src_res, src_fmt.fmt, info->src.level,
+                                 1, info->src.box.z, info->src.box.depth);
    iris_emit_buffer_barrier_for(batch, src_res->bo, IRIS_DOMAIN_OTHER_READ);
 
    struct iris_format_info dst_fmt =