diff options
| author | Jason Ekstrand <[email protected]> | 2018-06-26 09:35:35 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2019-01-14 10:16:52 -0600 |
| commit | c92c449361632ce9ea83698ea91bd1b8149dd745 (patch) | |
| tree | 3d2e0471bddc9b7ceb11f037cf10a79c3c44d780 /src/intel | |
| parent | 4bd976e3b8b796353ce577fd543803d74886303e (diff) | |
anv: Rename has_resolve to has_color_resolve
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/vulkan/anv_blorp.c | 2 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_pass.c | 4 | ||||
| -rw-r--r-- | 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 f0b1faae14b..892eb5f6d89 100644 --- a/src/intel/vulkan/anv_blorp.c +++ b/src/intel/vulkan/anv_blorp.c @@ -1311,7 +1311,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 83c57d0697d..f0eca41935e 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 770254e93ea..15d693eee47 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -3229,8 +3229,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 |