diff options
Diffstat (limited to 'src/intel/vulkan')
| -rw-r--r-- | src/intel/vulkan/anv_formats.c | 2 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_image.c | 14 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_private.h | 2 |
3 files changed, 5 insertions, 13 deletions
diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c index ebc6a8351c6..bd03b248ff9 100644 --- a/src/intel/vulkan/anv_formats.c +++ b/src/intel/vulkan/anv_formats.c @@ -409,7 +409,7 @@ anv_get_format(VkFormat vk_format) */ struct anv_format_plane anv_get_format_plane(const struct gen_device_info *devinfo, VkFormat vk_format, - VkImageAspectFlags aspect, VkImageTiling tiling) + VkImageAspectFlagBits aspect, VkImageTiling tiling) { const struct anv_format *format = anv_get_format(vk_format); struct anv_format_plane plane_format = { diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 73777d86a44..32aa8741ffd 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -34,14 +34,11 @@ #include "vk_format_info.h" -/** - * Exactly one bit must be set in \a aspect. - */ static isl_surf_usage_flags_t choose_isl_surf_usage(VkImageCreateFlags vk_create_flags, VkImageUsageFlags vk_usage, isl_surf_usage_flags_t isl_extra_usage, - VkImageAspectFlags aspect) + VkImageAspectFlagBits aspect) { isl_surf_usage_flags_t isl_usage = isl_extra_usage; @@ -93,11 +90,8 @@ choose_isl_surf_usage(VkImageCreateFlags vk_create_flags, return isl_usage; } -/** - * Exactly one bit must be set in \a aspect. - */ static struct anv_surface * -get_surface(struct anv_image *image, VkImageAspectFlags aspect) +get_surface(struct anv_image *image, VkImageAspectFlagBits aspect) { uint32_t plane = anv_image_aspect_to_plane(image->aspects, aspect); return &image->planes[plane].surface; @@ -253,14 +247,12 @@ add_fast_clear_state_buffer(struct anv_image *image, /** * Initialize the anv_image::*_surface selected by \a aspect. Then update the * image's memory requirements (that is, the image's size and alignment). - * - * Exactly one bit must be set in \a aspect. */ static VkResult make_surface(const struct anv_device *dev, struct anv_image *image, const struct anv_image_create_info *anv_info, - VkImageAspectFlags aspect) + VkImageAspectFlagBits aspect) { const VkImageCreateInfo *vk_info = anv_info->vk_info; bool ok UNUSED; diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 1fb3772f182..e17a52a4a70 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -2280,7 +2280,7 @@ anv_get_format_planes(VkFormat vk_format) struct anv_format_plane anv_get_format_plane(const struct gen_device_info *devinfo, VkFormat vk_format, - VkImageAspectFlags aspect, VkImageTiling tiling); + VkImageAspectFlagBits aspect, VkImageTiling tiling); static inline enum isl_format anv_get_isl_format(const struct gen_device_info *devinfo, VkFormat vk_format, |