diff --git a/src/virtio/vulkan/vn_common.c b/src/virtio/vulkan/vn_common.c index 49756e0f216..82f4af1d277 100644 --- a/src/virtio/vulkan/vn_common.c +++ b/src/virtio/vulkan/vn_common.c @@ -12,9 +12,9 @@ #include -#include "util/u_debug.h" #include "util/log.h" #include "util/os_misc.h" +#include "util/u_debug.h" #include "venus-protocol/vn_protocol_driver_info.h" #include "vk_enum_to_str.h" diff --git a/src/virtio/vulkan/vn_common.h b/src/virtio/vulkan/vn_common.h index e19ffb74e74..65c854678c4 100644 --- a/src/virtio/vulkan/vn_common.h +++ b/src/virtio/vulkan/vn_common.h @@ -168,10 +168,7 @@ vn_log_result(struct vn_instance *instance, const char *where); #define VN_REFCOUNT_INIT(val) \ - (struct vn_refcount) \ - { \ - .count = (val), \ - } + (struct vn_refcount) { .count = (val), } static inline int vn_refcount_load_relaxed(const struct vn_refcount *ref) diff --git a/src/virtio/vulkan/vn_cs.h b/src/virtio/vulkan/vn_cs.h index c01bf2d546c..a467a6dbf84 100644 --- a/src/virtio/vulkan/vn_cs.h +++ b/src/virtio/vulkan/vn_cs.h @@ -11,10 +11,7 @@ #include "venus-protocol/vn_protocol_driver_info.h" #define VN_CS_ENCODER_BUFFER_INITIALIZER(storage) \ - (struct vn_cs_encoder_buffer) \ - { \ - .base = storage, \ - } + (struct vn_cs_encoder_buffer) { .base = storage, } /* note that buffers points to an unamed local variable */ #define VN_CS_ENCODER_INITIALIZER_LOCAL(storage, size) \ diff --git a/src/virtio/vulkan/vn_queue.c b/src/virtio/vulkan/vn_queue.c index 2e359f322ae..fd8574f6c32 100644 --- a/src/virtio/vulkan/vn_queue.c +++ b/src/virtio/vulkan/vn_queue.c @@ -545,7 +545,9 @@ vn_submit_info2_has_external_signal_semaphore(uint32_t submit_count, } static VkResult -vn_queue_submit2_import_semaphores(struct vn_device *dev, uint32_t submit_count, const VkSubmitInfo2 *submits) +vn_queue_submit2_import_semaphores(struct vn_device *dev, + uint32_t submit_count, + const VkSubmitInfo2 *submits) { struct vn_instance *instance = dev->instance; VkDevice dev_h = vn_device_to_handle(dev); @@ -573,7 +575,8 @@ vn_queue_submit2_import_semaphores(struct vn_device *dev, uint32_t submit_count, .resourceId = 0, }; - vn_async_vkImportSemaphoreResource100000MESA(instance, dev_h, &res_info); + vn_async_vkImportSemaphoreResource100000MESA(instance, dev_h, + &res_info); } } @@ -644,8 +647,10 @@ vn_QueueSubmit2(VkQueue queue_h, VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT); const struct wsi_memory_signal_submit_info *wsi_info = NULL; - if (submitCount == 1) - wsi_info = vk_find_struct_const(pSubmits[0].pNext, WSI_MEMORY_SIGNAL_SUBMIT_INFO_MESA); + if (submitCount == 1) { + wsi_info = vk_find_struct_const(pSubmits[0].pNext, + WSI_MEMORY_SIGNAL_SUBMIT_INFO_MESA); + } const bool has_external_fence = fence && fence->is_external; const bool has_feedback_fence = fence && fence->feedback.slot;