[Mesa-dev] [PATCH 3/6] anv: Rename has_resolve to has_color_resolve

[Jason Ekstrand]

---
 src/intel/vulkan/anv_blorp.c   | 2 +-
 src/intel/vulkan/anv_pass.c    | 4 ++--
 src/intel/vulkan/anv_private.h | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c
index 478b8e7a3db..eee7a8c3b3c 100644
--- a/src/intel/vulkan/anv_blorp.c
+++ b/src/intel/vulkan/anv_blorp.c
@@ -1309,7 +1309,7 @@ anv_cmd_buffer_resolve_subpass(struct anv_cmd_buffer *cmd_buffer)
    struct anv_framebuffer *fb = cmd_buffer->state.framebuffer;
    struct anv_subpass *subpass = cmd_buffer->state.subpass;
 
-   if (subpass->has_resolve) {
+   if (subpass->has_color_resolve) {
       struct blorp_batch batch;
       blorp_batch_init(&cmd_buffer->device->blorp, &batch, cmd_buffer, 0);
 
diff --git a/src/intel/vulkan/anv_pass.c b/src/intel/vulkan/anv_pass.c
index 72bd99202ec..7b17cc06935 100644
--- a/src/intel/vulkan/anv_pass.c
+++ b/src/intel/vulkan/anv_pass.c
@@ -100,7 +100,7 @@ anv_render_pass_compile(struct anv_render_pass *pass)
       }
 
       /* We have to handle resolve attachments specially */
-      subpass->has_resolve = false;
+      subpass->has_color_resolve = false;
       if (subpass->resolve_attachments) {
          for (uint32_t j = 0; j < subpass->color_count; j++) {
             struct anv_subpass_attachment *color_att =
@@ -110,7 +110,7 @@ anv_render_pass_compile(struct anv_render_pass *pass)
             if (resolve_att->attachment == VK_ATTACHMENT_UNUSED)
                continue;
 
-            subpass->has_resolve = true;
+            subpass->has_color_resolve = true;
 
             assert(resolve_att->usage == VK_IMAGE_USAGE_TRANSFER_DST_BIT);
             color_att->usage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 903931472da..0b67e7598b4 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -3209,8 +3209,8 @@ struct anv_subpass {
    /** Subpass has a depth/stencil self-dependency */
    bool                                         has_ds_self_dep;
 
-   /** Subpass has at least one resolve attachment */
-   bool                                         has_resolve;
+   /** Subpass has at least one color resolve attachment */
+   bool                                         has_color_resolve;
 };
 
 static inline unsigned
-- 
2.20.1