Mesa (main): venus: format with clang-format
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Jan 27 20:45:20 UTC 2022
Module: Mesa
Branch: main
Commit: 350dfb8c3cc7c19af4200c02ea6f8ddb92edd644
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=350dfb8c3cc7c19af4200c02ea6f8ddb92edd644
Author: Chia-I Wu <olvaffe at gmail.com>
Date: Thu Jan 13 12:07:30 2022 -0800
venus: format with clang-format
clang-format misaligns one of the comments in
vn_physical_device_get_passthrough_extensions, but we can live with
that.
Reviewed-by: Yiwei Zhang <zzyiwei at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14550>
---
src/virtio/vulkan/vn_android.c | 5 +++--
src/virtio/vulkan/vn_instance.c | 4 ++--
src/virtio/vulkan/vn_physical_device.c | 2 +-
src/virtio/vulkan/vn_wsi.c | 5 ++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/virtio/vulkan/vn_android.c b/src/virtio/vulkan/vn_android.c
index 6c3412cb22c..4fd7d618da0 100644
--- a/src/virtio/vulkan/vn_android.c
+++ b/src/virtio/vulkan/vn_android.c
@@ -1005,8 +1005,9 @@ vn_android_device_import_ahb(struct vn_device *dev,
}
/* XXX Workaround before we use cross-domain backend in minigbm. The
- * blob_mem allocated from virgl backend can have a queried guest mappable
- * size smaller than the size returned from image memory requirement.
+ * blob_mem allocated from virgl backend can have a queried guest
+ * mappable size smaller than the size returned from image memory
+ * requirement.
*/
force_unmappable = true;
}
diff --git a/src/virtio/vulkan/vn_instance.c b/src/virtio/vulkan/vn_instance.c
index 47ed16d9d48..57d250f5582 100644
--- a/src/virtio/vulkan/vn_instance.c
+++ b/src/virtio/vulkan/vn_instance.c
@@ -778,8 +778,8 @@ vn_CreateInstance(const VkInstanceCreateInfo *pCreateInfo,
driParseOptionInfo(&instance->available_dri_options, vn_dri_options,
ARRAY_SIZE(vn_dri_options));
driParseConfigFiles(&instance->dri_options,
- &instance->available_dri_options, 0, "venus", NULL, NULL,
- instance->base.base.app_info.app_name,
+ &instance->available_dri_options, 0, "venus", NULL,
+ NULL, instance->base.base.app_info.app_name,
instance->base.base.app_info.app_version,
instance->base.base.app_info.engine_name,
instance->base.base.app_info.engine_version);
diff --git a/src/virtio/vulkan/vn_physical_device.c b/src/virtio/vulkan/vn_physical_device.c
index 7a6bba08b2d..f7b75068934 100644
--- a/src/virtio/vulkan/vn_physical_device.c
+++ b/src/virtio/vulkan/vn_physical_device.c
@@ -954,7 +954,7 @@ vn_physical_device_get_passthrough_extensions(
.EXT_separate_stencil_usage = true,
.EXT_shader_viewport_index_layer = true,
- /* EXT */
+ /* EXT */
#ifndef ANDROID
.EXT_image_drm_format_modifier = true,
#endif
diff --git a/src/virtio/vulkan/vn_wsi.c b/src/virtio/vulkan/vn_wsi.c
index 842154a7fe7..663062ad0b1 100644
--- a/src/virtio/vulkan/vn_wsi.c
+++ b/src/virtio/vulkan/vn_wsi.c
@@ -11,7 +11,6 @@
#include "vn_wsi.h"
#include "vk_enum_to_str.h"
-
#include "wsi_common_entrypoints.h"
#include "vn_device.h"
@@ -150,8 +149,8 @@ vn_CreateSwapchainKHR(VkDevice device,
{
struct vn_device *dev = vn_device_from_handle(device);
- VkResult result = wsi_CreateSwapchainKHR(device, pCreateInfo,
- pAllocator, pSwapchain);
+ VkResult result =
+ wsi_CreateSwapchainKHR(device, pCreateInfo, pAllocator, pSwapchain);
if (VN_DEBUG(WSI) && result == VK_SUCCESS) {
vn_log(dev->instance,
"swapchain %p: created with surface %p, min count %d, size "
More information about the mesa-commit
mailing list