diff options
| author | Jason Ekstrand <[email protected]> | 2016-08-30 17:49:32 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-09-13 12:40:12 -0700 |
| commit | 52fa3e83472ff6ad2652bfebc67b9f6860d64f24 (patch) | |
| tree | 11a6cd1c84140d01b733bba6825869e01088f834 | |
| parent | 8f780af968ffda8c4cc241017a2bca1338176167 (diff) | |
anv: Make image_get_surface_for_aspect_mask const
Signed-off-by: Jason Ekstrand <[email protected]>
Reviewed-by: Anuj Phogat <[email protected]>
| -rw-r--r-- | src/intel/vulkan/anv_image.c | 7 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_meta_copy.c | 4 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_private.h | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 63b8c86f5c3..3ab11e749ca 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -392,7 +392,7 @@ anv_image_view_init(struct anv_image_view *iview, break; } - struct anv_surface *surface = + const struct anv_surface *surface = anv_image_get_surface_for_aspect_mask(image, range->aspectMask); iview->image = image; @@ -653,8 +653,9 @@ anv_DestroyBufferView(VkDevice _device, VkBufferView bufferView, anv_free2(&device->alloc, pAllocator, view); } -struct anv_surface * -anv_image_get_surface_for_aspect_mask(struct anv_image *image, VkImageAspectFlags aspect_mask) +const struct anv_surface * +anv_image_get_surface_for_aspect_mask(const struct anv_image *image, + VkImageAspectFlags aspect_mask) { switch (aspect_mask) { case VK_IMAGE_ASPECT_COLOR_BIT: diff --git a/src/intel/vulkan/anv_meta_copy.c b/src/intel/vulkan/anv_meta_copy.c index 6a9f9c4b9af..3f548e69867 100644 --- a/src/intel/vulkan/anv_meta_copy.c +++ b/src/intel/vulkan/anv_meta_copy.c @@ -278,9 +278,9 @@ void anv_CmdCopyImage( VkImageAspectFlags aspect = pRegions[r].srcSubresource.aspectMask; /* Create blit surfaces */ - struct anv_surface *src_surf = + const struct anv_surface *src_surf = anv_image_get_surface_for_aspect_mask(src_image, aspect); - struct anv_surface *dst_surf = + const struct anv_surface *dst_surf = anv_image_get_surface_for_aspect_mask(dest_image, aspect); struct anv_meta_blit2d_surf b_src = blit_surf_for_image(src_image, src_surf); diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index a01aeba2120..a083f93fc64 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -1753,8 +1753,8 @@ VkResult anv_image_create(VkDevice _device, const VkAllocationCallbacks* alloc, VkImage *pImage); -struct anv_surface * -anv_image_get_surface_for_aspect_mask(struct anv_image *image, +const struct anv_surface * +anv_image_get_surface_for_aspect_mask(const struct anv_image *image, VkImageAspectFlags aspect_mask); void anv_image_view_init(struct anv_image_view *view, |