diff --git a/src/amd/vulkan/radv_formats.h b/src/amd/vulkan/radv_formats.h index 2798704a25d..b9d53b16155 100644 --- a/src/amd/vulkan/radv_formats.h +++ b/src/amd/vulkan/radv_formats.h @@ -20,7 +20,7 @@ #include "vk_format.h" static inline enum pipe_format -radv_format_to_pipe_format(enum VkFormat vkformat) +radv_format_to_pipe_format(VkFormat vkformat) { switch (vkformat) { case VK_FORMAT_R10X6_UNORM_PACK16: diff --git a/src/amd/vulkan/radv_pipeline_graphics.h b/src/amd/vulkan/radv_pipeline_graphics.h index 56d51cbb50f..1b6b80093e5 100644 --- a/src/amd/vulkan/radv_pipeline_graphics.h +++ b/src/amd/vulkan/radv_pipeline_graphics.h @@ -332,7 +332,7 @@ radv_translate_fill(VkPolygonMode func) } static inline uint32_t -radv_translate_stencil_op(enum VkStencilOp op) +radv_translate_stencil_op(VkStencilOp op) { switch (op) { case VK_STENCIL_OP_KEEP: diff --git a/src/asahi/vulkan/hk_image.h b/src/asahi/vulkan/hk_image.h index 32289d14131..480b68e6b59 100644 --- a/src/asahi/vulkan/hk_image.h +++ b/src/asahi/vulkan/hk_image.h @@ -89,7 +89,7 @@ hk_image_base_address(const struct hk_image *image, uint8_t plane) } static inline enum pipe_format -hk_format_to_pipe_format(enum VkFormat vkformat) +hk_format_to_pipe_format(VkFormat vkformat) { switch (vkformat) { case VK_FORMAT_R10X6_UNORM_PACK16: diff --git a/src/asahi/vulkan/hk_queue.c b/src/asahi/vulkan/hk_queue.c index ba61fe1707b..1cbeee4f42c 100644 --- a/src/asahi/vulkan/hk_queue.c +++ b/src/asahi/vulkan/hk_queue.c @@ -558,7 +558,7 @@ hk_queue_submit(struct vk_queue *vk_queue, struct vk_queue_submit *submit) } static uint32_t -translate_priority(enum VkQueueGlobalPriorityKHR prio) +translate_priority(VkQueueGlobalPriorityKHR prio) { /* clang-format off */ switch (prio) { @@ -584,7 +584,7 @@ hk_queue_init(struct hk_device *dev, struct hk_queue *queue, const VkDeviceQueueGlobalPriorityCreateInfoKHR *priority_info = vk_find_struct_const(pCreateInfo->pNext, DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR); - const enum VkQueueGlobalPriorityKHR priority = + const VkQueueGlobalPriorityKHR priority = priority_info ? priority_info->globalPriority : VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR; diff --git a/src/freedreno/vulkan/tu_cmd_buffer.cc b/src/freedreno/vulkan/tu_cmd_buffer.cc index 1b380cb62fa..360769046df 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.cc +++ b/src/freedreno/vulkan/tu_cmd_buffer.cc @@ -3181,7 +3181,7 @@ tu_CmdBindDescriptorBufferEmbeddedSamplers2EXT( } } -static enum VkResult +static VkResult tu_push_descriptor_set_update_layout(struct tu_device *device, struct tu_descriptor_set *set, struct tu_descriptor_set_layout *layout) diff --git a/src/freedreno/vulkan/tu_device.cc b/src/freedreno/vulkan/tu_device.cc index d10e90b2a09..dad3d21196f 100644 --- a/src/freedreno/vulkan/tu_device.cc +++ b/src/freedreno/vulkan/tu_device.cc @@ -1851,7 +1851,7 @@ tu_queue_init(struct tu_device *device, const VkDeviceQueueGlobalPriorityCreateInfoKHR *priority_info = vk_find_struct_const(create_info->pNext, DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR); - const enum VkQueueGlobalPriorityKHR global_priority = priority_info ? + const VkQueueGlobalPriorityKHR global_priority = priority_info ? priority_info->globalPriority : (TU_DEBUG(HIPRIO) ? VK_QUEUE_GLOBAL_PRIORITY_HIGH_KHR : VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR); diff --git a/src/freedreno/vulkan/tu_query_pool.cc b/src/freedreno/vulkan/tu_query_pool.cc index fc758c5c738..3780fab338f 100644 --- a/src/freedreno/vulkan/tu_query_pool.cc +++ b/src/freedreno/vulkan/tu_query_pool.cc @@ -1269,7 +1269,7 @@ template static void emit_stop_primitive_ctrs(struct tu_cmd_buffer *cmdbuf, struct tu_cs *cs, - enum VkQueryType query_type) + VkQueryType query_type) { bool is_secondary = cmdbuf->vk.level == VK_COMMAND_BUFFER_LEVEL_SECONDARY; cmdbuf->state.prim_counters_running--; diff --git a/src/gallium/frontends/lavapipe/lvp_conv.h b/src/gallium/frontends/lavapipe/lvp_conv.h index 5ebb46445f4..31bd5af7b25 100644 --- a/src/gallium/frontends/lavapipe/lvp_conv.h +++ b/src/gallium/frontends/lavapipe/lvp_conv.h @@ -91,7 +91,7 @@ static inline unsigned vk_conv_topology(VkPrimitiveTopology topology) } } -static inline unsigned vk_conv_wrap_mode(enum VkSamplerAddressMode addr_mode) +static inline unsigned vk_conv_wrap_mode(VkSamplerAddressMode addr_mode) { switch (addr_mode) { case VK_SAMPLER_ADDRESS_MODE_REPEAT: diff --git a/src/nouveau/vulkan/nvk_format.h b/src/nouveau/vulkan/nvk_format.h index fe666b1042e..43846cbde8b 100644 --- a/src/nouveau/vulkan/nvk_format.h +++ b/src/nouveau/vulkan/nvk_format.h @@ -27,7 +27,7 @@ const struct nvk_va_format * nvk_get_va_format(const struct nvk_physical_device *pdev, VkFormat format); static inline enum pipe_format -nvk_format_to_pipe_format(enum VkFormat vkformat) +nvk_format_to_pipe_format(VkFormat vkformat) { switch (vkformat) { case VK_FORMAT_R10X6_UNORM_PACK16: diff --git a/src/panfrost/vulkan/csf/panvk_vX_queue.c b/src/panfrost/vulkan/csf/panvk_vX_queue.c index ca94bfeddb4..e08202e7d39 100644 --- a/src/panfrost/vulkan/csf/panvk_vX_queue.c +++ b/src/panfrost/vulkan/csf/panvk_vX_queue.c @@ -1057,7 +1057,7 @@ get_panthor_group_priority(const VkDeviceQueueCreateInfo *create_info) const VkDeviceQueueGlobalPriorityCreateInfoKHR *priority_info = vk_find_struct_const(create_info->pNext, DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR); - const enum VkQueueGlobalPriorityKHR priority = + const VkQueueGlobalPriorityKHR priority = priority_info ? priority_info->globalPriority : VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR; diff --git a/src/panfrost/vulkan/jm/panvk_vX_queue.c b/src/panfrost/vulkan/jm/panvk_vX_queue.c index f9b924ac52e..e72319d035b 100644 --- a/src/panfrost/vulkan/jm/panvk_vX_queue.c +++ b/src/panfrost/vulkan/jm/panvk_vX_queue.c @@ -313,7 +313,7 @@ panvk_per_arch(queue_init)(struct panvk_device *device, ASSERTED const VkDeviceQueueGlobalPriorityCreateInfoKHR *priority_info = vk_find_struct_const(create_info->pNext, DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR); - ASSERTED const enum VkQueueGlobalPriorityKHR priority = + ASSERTED const VkQueueGlobalPriorityKHR priority = priority_info ? priority_info->globalPriority : VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR; diff --git a/src/panfrost/vulkan/panvk_vX_device.c b/src/panfrost/vulkan/panvk_vX_device.c index b6c14000e3e..f26de1d1369 100644 --- a/src/panfrost/vulkan/panvk_vX_device.c +++ b/src/panfrost/vulkan/panvk_vX_device.c @@ -156,7 +156,7 @@ panvk_meta_cleanup(struct panvk_device *device) static enum pan_kmod_group_allow_priority_flags global_priority_to_group_allow_priority_flag( - enum VkQueueGlobalPriorityKHR priority) + VkQueueGlobalPriorityKHR priority) { switch (priority) { case VK_QUEUE_GLOBAL_PRIORITY_LOW_KHR: @@ -179,7 +179,7 @@ check_global_priority(const struct panvk_physical_device *phys_dev, const VkDeviceQueueGlobalPriorityCreateInfoKHR *priority_info = vk_find_struct_const(create_info->pNext, DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR); - const enum VkQueueGlobalPriorityKHR priority = + const VkQueueGlobalPriorityKHR priority = priority_info ? priority_info->globalPriority : VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR; diff --git a/src/virtio/vulkan/vn_physical_device.h b/src/virtio/vulkan/vn_physical_device.h index 5e12acd5c52..102d24d125c 100644 --- a/src/virtio/vulkan/vn_physical_device.h +++ b/src/virtio/vulkan/vn_physical_device.h @@ -78,7 +78,7 @@ struct vn_physical_device { */ uint32_t wa_min_fb_align; - enum VkDriverId renderer_driver_id; + VkDriverId renderer_driver_id; VkQueueFamilyProperties2 *queue_family_properties; uint32_t queue_family_count; diff --git a/src/vulkan/runtime/vk_blend.c b/src/vulkan/runtime/vk_blend.c index b7253bb0ea7..8268f6ce89b 100644 --- a/src/vulkan/runtime/vk_blend.c +++ b/src/vulkan/runtime/vk_blend.c @@ -68,7 +68,7 @@ vk_blend_op_to_pipe(VkBlendOp in) } enum pipe_blendfactor -vk_blend_factor_to_pipe(enum VkBlendFactor vk_factor) +vk_blend_factor_to_pipe(VkBlendFactor vk_factor) { switch (vk_factor) { case VK_BLEND_FACTOR_ZERO: diff --git a/src/vulkan/util/vk_format.c b/src/vulkan/util/vk_format.c index 2c821e48ae6..d35cf0551cd 100644 --- a/src/vulkan/util/vk_format.c +++ b/src/vulkan/util/vk_format.c @@ -260,7 +260,7 @@ const enum pipe_format vk_format_map[] = { }; enum pipe_format -vk_format_to_pipe_format(enum VkFormat vkformat) +vk_format_to_pipe_format(VkFormat vkformat) { if (vkformat >= ARRAY_SIZE(vk_format_map)) { switch (vkformat) { diff --git a/src/vulkan/util/vk_format.h b/src/vulkan/util/vk_format.h index 13023c96682..03866aa78c6 100644 --- a/src/vulkan/util/vk_format.h +++ b/src/vulkan/util/vk_format.h @@ -36,7 +36,7 @@ extern "C" { extern const enum pipe_format vk_format_map[]; enum pipe_format -vk_format_to_pipe_format(enum VkFormat vkformat); +vk_format_to_pipe_format(VkFormat vkformat); VkFormat vk_format_from_pipe_format(enum pipe_format format); diff --git a/src/vulkan/util/vk_util.h b/src/vulkan/util/vk_util.h index dd0b7b43f0e..b7292e7dd3f 100644 --- a/src/vulkan/util/vk_util.h +++ b/src/vulkan/util/vk_util.h @@ -362,7 +362,7 @@ vk_spec_info_to_nir_spirv(const VkSpecializationInfo *spec_info, if (name != _stack_##name) free(name) static inline uint8_t -vk_index_type_to_bytes(enum VkIndexType type) +vk_index_type_to_bytes(VkIndexType type) { switch (type) { case VK_INDEX_TYPE_NONE_KHR: return 0; @@ -374,7 +374,7 @@ vk_index_type_to_bytes(enum VkIndexType type) } static inline uint32_t -vk_index_to_restart(enum VkIndexType type) +vk_index_to_restart(VkIndexType type) { switch (type) { case VK_INDEX_TYPE_UINT8_KHR: return 0xff; diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c index 548bbc8c930..d18ca4d9ebd 100644 --- a/src/vulkan/wsi/wsi_common.c +++ b/src/vulkan/wsi/wsi_common.c @@ -534,7 +534,7 @@ fail: return supported; } -enum VkPresentModeKHR +VkPresentModeKHR wsi_swapchain_get_present_mode(struct wsi_device *wsi, const VkSwapchainCreateInfoKHR *pCreateInfo) { diff --git a/src/vulkan/wsi/wsi_common_private.h b/src/vulkan/wsi/wsi_common_private.h index 8d4c2072003..849bdc6715f 100644 --- a/src/vulkan/wsi/wsi_common_private.h +++ b/src/vulkan/wsi/wsi_common_private.h @@ -244,7 +244,7 @@ wsi_swapchain_init(const struct wsi_device *wsi, const struct wsi_base_image_params *image_params, const VkAllocationCallbacks *pAllocator); -enum VkPresentModeKHR +VkPresentModeKHR wsi_swapchain_get_present_mode(struct wsi_device *wsi, const VkSwapchainCreateInfoKHR *pCreateInfo);