diff options
| author | Chad Versace <[email protected]> | 2015-10-05 16:24:53 -0700 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2015-10-05 17:46:04 -0700 |
| commit | f0f4dfa9cc1473c5e12eeeb9403f721d5611e905 (patch) | |
| tree | 85bda7f2722d8499c7abccf423e0a633f340269e /src/vulkan/anv_meta.c | |
| parent | 74193a880f475da40e8c03ff7e772f3a288317a8 (diff) | |
vk: Drop anv_surface_view
Push the members of struct anv_surface_view into anv_image_view and
anv_buffer_view, then remove struct anv_surface_view. Observe that
anv_surface_view::range is not needed for anv_image_view, and so was
dropped there.
This prepares for the merge of VkAttachmentView into VkImageView. Remove
the common parent of anv_buffer_view and anv_image_view (that is,
anv_surface_view) will make the merge easier.
Diffstat (limited to 'src/vulkan/anv_meta.c')
| -rw-r--r-- | src/vulkan/anv_meta.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c index fe235e23fb0..1574830e0b8 100644 --- a/src/vulkan/anv_meta.c +++ b/src/vulkan/anv_meta.c @@ -739,7 +739,7 @@ meta_emit_blit(struct anv_cmd_buffer *cmd_buffer, { struct anv_device *device = cmd_buffer->device; struct anv_attachment_view *dest_aview = &dest_cview->attachment_view; - struct anv_surface_view *dest_sview = &dest_cview->surface_view; + struct anv_image_view *dest_iview = &dest_cview->image_view; VkDescriptorPool dummy_desc_pool = { .handle = 1 }; struct blit_vb_data { @@ -854,7 +854,7 @@ meta_emit_blit(struct anv_cmd_buffer *cmd_buffer, .attachmentCount = 1, .pAttachments = &(VkAttachmentDescription) { .sType = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION, - .format = dest_sview->format->vk_format, + .format = dest_iview->format->vk_format, .loadOp = VK_ATTACHMENT_LOAD_OP_LOAD, .storeOp = VK_ATTACHMENT_STORE_OP_STORE, .initialLayout = VK_IMAGE_LAYOUT_GENERAL, @@ -1561,7 +1561,7 @@ void anv_CmdClearColorImage( cmd_buffer); struct anv_attachment_view *aview = &cview.attachment_view; - struct anv_surface_view *sview = &cview.surface_view; + struct anv_image_view *iview = &cview.image_view; VkFramebuffer fb; anv_CreateFramebuffer(anv_device_to_handle(cmd_buffer->device), @@ -1586,7 +1586,7 @@ void anv_CmdClearColorImage( .attachmentCount = 1, .pAttachments = &(VkAttachmentDescription) { .sType = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION, - .format = sview->format->vk_format, + .format = iview->format->vk_format, .loadOp = VK_ATTACHMENT_LOAD_OP_LOAD, .storeOp = VK_ATTACHMENT_STORE_OP_STORE, .initialLayout = VK_IMAGE_LAYOUT_GENERAL, |