Mesa (master): iris: Stop using blorp_hiz_stencil_op

[GitLab Mirror]

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

Author: Nanley Chery <nanley.g.chery at intel.com>
Date:   Wed Dec  9 13:20:26 2020 -0800

iris: Stop using blorp_hiz_stencil_op

Delete this function call for two reasons:

1. Calling blorp_hiz_stencil_op within iris_resolve_color seems out of
   place.
2. AFAICT, iris stopped doing STC_CCS resolves with commit
   5b82d8ce8bc681905a8902902fb89151ca32d6c9.

Reviewed-by: Sagar Ghuge <sagar.ghuge at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8021>

---

 src/gallium/drivers/iris/iris_resolve.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c
index dd4d413c113..9a9dea1d5ae 100644
--- a/src/gallium/drivers/iris/iris_resolve.c
+++ b/src/gallium/drivers/iris/iris_resolve.c
@@ -414,16 +414,8 @@ iris_resolve_color(struct iris_context *ice,
    iris_batch_sync_region_start(batch);
    struct blorp_batch blorp_batch;
    blorp_batch_init(&ice->blorp, &blorp_batch, batch, 0);
-   /* On Gen >= 12, Stencil buffer with lossless compression needs to be
-    * resolve with WM_HZ_OP packet.
-    */
-   if (res->aux.usage == ISL_AUX_USAGE_STC_CCS) {
-      blorp_hiz_stencil_op(&blorp_batch, &surf, level, layer,
-                           1, resolve_op);
-   } else {
-      blorp_ccs_resolve(&blorp_batch, &surf, level, layer, 1,
-                        res->surf.format, resolve_op);
-   }
+   blorp_ccs_resolve(&blorp_batch, &surf, level, layer, 1, res->surf.format,
+                     resolve_op);
    blorp_batch_finish(&blorp_batch);
 
    /* See comment above */
@@ -724,6 +716,8 @@ iris_resource_prepare_access(struct iris_context *ice,
             iris_mcs_partial_resolve(ice, batch, res, layer, 1);
          } else if (isl_aux_usage_has_hiz(res->aux.usage)) {
             iris_hiz_exec(ice, batch, res, level, layer, 1, aux_op, false);
+         } else if (res->aux.usage == ISL_AUX_USAGE_STC_CCS) {
+            unreachable("iris doesn't resolve STC_CCS resources");
          } else {
             assert(isl_aux_usage_has_ccs(res->aux.usage));
             iris_resolve_color(ice, batch, res, level, layer, aux_op);