Mesa (main): radv: Minor formatting fix in radv_device.c file.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue May 10 08:48:41 UTC 2022


Module: Mesa
Branch: main
Commit: 643a6a215348dab66f583f1e025086c1d432dfac
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=643a6a215348dab66f583f1e025086c1d432dfac

Author: Timur Kristóf <timur.kristof at gmail.com>
Date:   Thu May  5 19:50:10 2022 +0200

radv: Minor formatting fix in radv_device.c file.

Signed-off-by: Timur Kristóf <timur.kristof at gmail.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>
Reviewed-By: Tatsuyuki Ishi <ishitatsuyuki at gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16358>

---

 src/amd/vulkan/radv_device.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 2b3223068a3..b6343d1e504 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -4126,8 +4126,9 @@ radv_get_preamble_cs(struct radv_queue *queue, uint32_t scratch_size_per_wave,
          size = 112; /* 2 dword + 2 padding + 4 dword * 6 */
          if (add_sample_positions)
             size += 128; /* 64+32+16+8 = 120 bytes */
-      } else if (scratch_bo)
+      } else if (scratch_bo) {
          size = 8; /* 2 dword */
+      }
 
       result = queue->device->ws->buffer_create(
          queue->device->ws, size, 4096, RADEON_DOMAIN_VRAM,
@@ -4556,9 +4557,8 @@ radv_queue_submit(struct vk_queue *vqueue, struct vk_queue_submit *submission)
       return VK_SUCCESS;
 
    if (!submission->command_buffer_count) {
-      result = queue->device->ws->cs_submit(ctx, ring,
-                                            queue->vk.index_in_family, NULL, 0, NULL, NULL,
-                                            submission->wait_count, submission->waits,
+      result = queue->device->ws->cs_submit(ctx, ring, queue->vk.index_in_family, NULL, 0, NULL,
+                                            NULL, submission->wait_count, submission->waits,
                                             submission->signal_count, submission->signals, false);
       if (result != VK_SUCCESS)
          goto fail;
@@ -4594,10 +4594,9 @@ radv_queue_submit(struct vk_queue *vqueue, struct vk_queue_submit *submission)
             *queue->device->trace_id_ptr = 0;
 
          result = queue->device->ws->cs_submit(
-            ctx, ring, queue->vk.index_in_family, cs_array + j, advance,
-            initial_preamble, continue_preamble_cs, j == 0 ? submission->wait_count : 0,
-            submission->waits, last_submit ? submission->signal_count : 0, submission->signals,
-            can_patch);
+            ctx, ring, queue->vk.index_in_family, cs_array + j, advance, initial_preamble,
+            continue_preamble_cs, j == 0 ? submission->wait_count : 0, submission->waits,
+            last_submit ? submission->signal_count : 0, submission->signals, can_patch);
          if (result != VK_SUCCESS) {
             free(cs_array);
             if (queue->device->trace_bo)
@@ -6324,9 +6323,9 @@ vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *pSupportedVersion)
     *
     *    - Loader interface v4 differs from v3 in:
     *        - The ICD must implement vk_icdGetPhysicalDeviceProcAddr().
-    * 
+    *
     *    - Loader interface v5 differs from v4 in:
-    *        - The ICD must support Vulkan API version 1.1 and must not return 
+    *        - The ICD must support Vulkan API version 1.1 and must not return
     *          VK_ERROR_INCOMPATIBLE_DRIVER from vkCreateInstance() unless a
     *          Vulkan Loader with interface v4 or smaller is being used and the
     *          application provides an API version that is greater than 1.0.



More information about the mesa-commit mailing list