nvk: Misc. style nits

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>

diff --git a/src/nouveau/vulkan/nvk_bo_sync.c b/src/nouveau/vulkan/nvk_bo_sync.c
index b640b23..b04226a 100644 (file)
--- a/src/nouveau/vulkan/nvk_bo_sync.c
+++ b/src/nouveau/vulkan/nvk_bo_sync.c
@@ -106,7 +106,7 @@ nvk_get_relative_timeout(uint64_t abs_timeout)
       return 0;
 
    uint64_t rel_timeout = abs_timeout - now;
-   if (rel_timeout > (uint64_t) INT64_MAX)
+   if (rel_timeout > (uint64_t)INT64_MAX)
       rel_timeout = INT64_MAX;
 
    return rel_timeout;
@@ -116,8 +116,8 @@ static VkResult
 nvk_wait_dmabuf(struct nvk_device *dev, int dmabuf_fd,
                 uint64_t abs_timeout_ns)
 {
-   uint64_t now = os_time_get_nano();
-   uint64_t rel_timeout_ns =
+   const uint64_t now = os_time_get_nano();
+   const uint64_t rel_timeout_ns =
       now < abs_timeout_ns ? abs_timeout_ns - now : 0;
 
    struct timespec rel_timeout_ts = {
@@ -132,8 +132,7 @@ nvk_wait_dmabuf(struct nvk_device *dev, int dmabuf_fd,
 
    int ret = ppoll(&fd, 1, &rel_timeout_ts, NULL);
    if (ret < 0) {
-      return vk_errorf(dev, VK_ERROR_UNKNOWN,
-                       "poll() failed: %m");
+      return vk_errorf(dev, VK_ERROR_UNKNOWN, "poll() failed: %m");
    } else if (ret == 0) {
       return VK_TIMEOUT;
    } else {

diff --git a/src/nouveau/vulkan/nvk_buffer.c b/src/nouveau/vulkan/nvk_buffer.c
index 1351ddc..4d3f22f 100644 (file)
--- a/src/nouveau/vulkan/nvk_buffer.c
+++ b/src/nouveau/vulkan/nvk_buffer.c
@@ -118,7 +118,8 @@ nvk_GetPhysicalDeviceExternalBufferProperties(
    switch (pExternalBufferInfo->handleType) {
    case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT:
    case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT:
-      pExternalBufferProperties->externalMemoryProperties = nvk_dma_buf_mem_props;
+      pExternalBufferProperties->externalMemoryProperties =
+         nvk_dma_buf_mem_props;
       return;
    default:
       goto unsupported;

diff --git a/src/nouveau/vulkan/nvk_buffer_view.c b/src/nouveau/vulkan/nvk_buffer_view.c
index 1da6ff8..ea85b3f 100644 (file)
--- a/src/nouveau/vulkan/nvk_buffer_view.c
+++ b/src/nouveau/vulkan/nvk_buffer_view.c
@@ -1,11 +1,12 @@
 #include "nvk_buffer_view.h"
 
-#include "nil_image.h"
 #include "nil_format.h"
+#include "nil_image.h"
 #include "nvk_buffer.h"
 #include "nvk_device.h"
 #include "nvk_format.h"
 #include "nvk_physical_device.h"
+
 #include "vulkan/util/vk_format.h"
 
 VkFormatFeatureFlags2

diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.c b/src/nouveau/vulkan/nvk_cmd_buffer.c
index 25b9aa6..eaae440 100644 (file)
--- a/src/nouveau/vulkan/nvk_cmd_buffer.c
+++ b/src/nouveau/vulkan/nvk_cmd_buffer.c
@@ -6,19 +6,18 @@
 #include "nvk_descriptor_set_layout.h"
 #include "nvk_device.h"
 #include "nvk_device_memory.h"
-#include "nvk_pipeline.h"
-#include "nvk_physical_device.h"
-#include "nvk_buffer.h"
 #include "nvk_mme.h"
+#include "nvk_physical_device.h"
+#include "nvk_pipeline.h"
 
 #include "nouveau_context.h"
 
 #include "nouveau/nouveau.h"
 
-#include "nvk_clc597.h"
+#include "nvk_cl906f.h"
 #include "nvk_cl90b5.h"
 #include "nvk_cla0c0.h"
-#include "nvk_cl906f.h"
+#include "nvk_clc597.h"
 
 static void
 nvk_destroy_cmd_buffer(struct vk_command_buffer *vk_cmd_buffer)
@@ -55,8 +54,7 @@ nvk_create_cmd_buffer(struct vk_command_pool *vk_pool,
       return result;
    }
 
-   cmd->vk.dynamic_graphics_state.vi =
-      &cmd->state.gfx._dynamic_vi;
+   cmd->vk.dynamic_graphics_state.vi = &cmd->state.gfx._dynamic_vi;
    cmd->vk.dynamic_graphics_state.ms.sample_locations =
       &cmd->state.gfx._dynamic_sl;
 
@@ -491,7 +489,7 @@ nvk_cmd_buffer_dump(struct nvk_cmd_buffer *cmd, FILE *fp)
          };
          vk_push_print(fp, &push, &dev->pdev->info);
       } else {
-         fprintf(fp, "<%u B of INDIRECT DATA at 0x%"PRIx64">\n",
+         fprintf(fp, "<%u B of INDIRECT DATA at 0x%" PRIx64 ">\n",
                  p->range & ~NVC0_IB_ENTRY_1_NO_PREFETCH,
                  p->bo->offset + p->bo_offset);
       }
@@ -517,17 +515,17 @@ nvk_CmdPushDescriptorSetWithTemplateKHR(VkCommandBuffer commandBuffer,
    struct nvk_descriptor_set_layout *set_layout =
       vk_to_nvk_descriptor_set_layout(pipeline_layout->set_layouts[set]);
 
-   nvk_push_descriptor_set_update_template(push_set, set_layout,
-                                           template, pData);
+   nvk_push_descriptor_set_update_template(push_set, set_layout, template,
+                                           pData);
 }
 
 VKAPI_ATTR void VKAPI_CALL
 nvk_CmdBindTransformFeedbackBuffersEXT(VkCommandBuffer commandBuffer,
                                        uint32_t firstBinding,
                                        uint32_t bindingCount,
-                                       const VkBuffer* pBuffers,
-                                       const VkDeviceSize* pOffsets,
-                                       const VkDeviceSize* pSizes)
+                                       const VkBuffer *pBuffers,
+                                       const VkDeviceSize *pOffsets,
+                                       const VkDeviceSize *pSizes)
 {
    VK_FROM_HANDLE(nvk_cmd_buffer, cmd, commandBuffer);
 
@@ -580,13 +578,13 @@ VKAPI_ATTR void VKAPI_CALL
 nvk_CmdBeginTransformFeedbackEXT(VkCommandBuffer commandBuffer,
                                  uint32_t firstCounterBuffer,
                                  uint32_t counterBufferCount,
-                                 const VkBuffer* pCounterBuffers,
-                                 const VkDeviceSize* pCounterBufferOffsets)
+                                 const VkBuffer *pCounterBuffers,
+                                 const VkDeviceSize *pCounterBufferOffsets)
 {
    VK_FROM_HANDLE(nvk_cmd_buffer, cmd, commandBuffer);
    const uint32_t max_buffers = 4;
 
-   struct nv_push *p = nvk_cmd_buffer_push(cmd, 2+2*max_buffers);
+   struct nv_push *p = nvk_cmd_buffer_push(cmd, 2 + 2 * max_buffers);
 
    P_IMMD(p, NV9097, SET_STREAM_OUTPUT, ENABLE_TRUE);
    for (uint32_t i = 0; i < max_buffers; ++i) {
@@ -627,8 +625,8 @@ VKAPI_ATTR void VKAPI_CALL
 nvk_CmdEndTransformFeedbackEXT(VkCommandBuffer commandBuffer,
                                uint32_t firstCounterBuffer,
                                uint32_t counterBufferCount,
-                               const VkBuffer* pCounterBuffers,
-                               const VkDeviceSize* pCounterBufferOffsets)
+                               const VkBuffer *pCounterBuffers,
+                               const VkDeviceSize *pCounterBufferOffsets)
 {
    VK_FROM_HANDLE(nvk_cmd_buffer, cmd, commandBuffer);
 

diff --git a/src/nouveau/vulkan/nvk_cmd_clear.c b/src/nouveau/vulkan/nvk_cmd_clear.c
index a7f14c0..48b6b51 100644 (file)
--- a/src/nouveau/vulkan/nvk_cmd_clear.c
+++ b/src/nouveau/vulkan/nvk_cmd_clear.c
@@ -12,7 +12,8 @@
 #include "nvk_cl9097.h"
 #include "drf.h"
 
-void nvk_mme_clear(struct mme_builder *b)
+void
+nvk_mme_clear(struct mme_builder *b)
 {
    struct mme_value payload = mme_load(b);
    struct mme_value view_mask = nvk_mme_load_scratch(b, VIEW_MASK);

diff --git a/src/nouveau/vulkan/nvk_cmd_copy.c b/src/nouveau/vulkan/nvk_cmd_copy.c
index 732b84d..b03a83b 100644 (file)
--- a/src/nouveau/vulkan/nvk_cmd_copy.c
+++ b/src/nouveau/vulkan/nvk_cmd_copy.c
@@ -39,10 +39,9 @@ struct nouveau_copy {
 };
 
 static struct nouveau_copy_buffer
-nouveau_copy_rect_buffer(
-   struct nvk_buffer *buf,
-   VkDeviceSize offset,
-   struct vk_image_buffer_layout buffer_layout)
+nouveau_copy_rect_buffer(struct nvk_buffer *buf,
+                         VkDeviceSize offset,
+                         struct vk_image_buffer_layout buffer_layout)
 {
    return (struct nouveau_copy_buffer) {
       .base_addr = nvk_buffer_address(buf, offset),
@@ -66,11 +65,10 @@ vk_to_nil_extent(VkExtent3D extent, uint32_t array_layers)
 }
 
 static struct nouveau_copy_buffer
-nouveau_copy_rect_image(
-   struct nvk_image *img,
-   struct nvk_image_plane *plane,
-   VkOffset3D offset_px,
-   const VkImageSubresourceLayers *sub_res)
+nouveau_copy_rect_image(struct nvk_image *img,
+                        struct nvk_image_plane *plane,
+                        VkOffset3D offset_px,
+                        const VkImageSubresourceLayers *sub_res)
 {
    const struct nil_extent4d lvl_extent4d_px =
       nil_image_level_extent_px(&plane->nil, sub_res->mipLevel);
@@ -387,7 +385,6 @@ nvk_CmdCopyBufferToImage2(VkCommandBuffer commandBuffer,
             copy.remap.dst[1] = NV90B5_SET_REMAP_COMPONENTS_DST_Y_NO_WRITE;
             copy.remap.dst[2] = NV90B5_SET_REMAP_COMPONENTS_DST_Z_NO_WRITE;
             copy.remap.dst[3] = NV90B5_SET_REMAP_COMPONENTS_DST_W_NO_WRITE;
-            //copy.dst.bpp = 8;
          } else {
             assert(aspects == VK_IMAGE_ASPECT_STENCIL_BIT);
             copy2.dst = copy.dst;
@@ -408,7 +405,6 @@ nvk_CmdCopyBufferToImage2(VkCommandBuffer commandBuffer,
             copy2.remap.dst[1] = NV90B5_SET_REMAP_COMPONENTS_DST_Y_NO_WRITE;
             copy2.remap.dst[2] = NV90B5_SET_REMAP_COMPONENTS_DST_Z_SRC_X;
             copy2.remap.dst[3] = NV90B5_SET_REMAP_COMPONENTS_DST_W_NO_WRITE;
-            //copy2.dst.bpp = 8;
          }
          break;
       case VK_FORMAT_D24_UNORM_S8_UINT:
@@ -494,7 +490,6 @@ nvk_CmdCopyImageToBuffer2(VkCommandBuffer commandBuffer,
             copy.remap.dst[1] = NV90B5_SET_REMAP_COMPONENTS_DST_Y_NO_WRITE;
             copy.remap.dst[2] = NV90B5_SET_REMAP_COMPONENTS_DST_Z_NO_WRITE;
             copy.remap.dst[3] = NV90B5_SET_REMAP_COMPONENTS_DST_W_NO_WRITE;
-            //copy.src.bpp = 8;
          } else {
             assert(aspects == VK_IMAGE_ASPECT_STENCIL_BIT);
             copy2.dst = copy.dst;
@@ -509,7 +504,6 @@ nvk_CmdCopyImageToBuffer2(VkCommandBuffer commandBuffer,
             copy.remap.dst[1] = NV90B5_SET_REMAP_COMPONENTS_DST_Y_NO_WRITE;
             copy.remap.dst[2] = NV90B5_SET_REMAP_COMPONENTS_DST_Z_NO_WRITE;
             copy.remap.dst[3] = NV90B5_SET_REMAP_COMPONENTS_DST_W_NO_WRITE;
-            //copy.src.bpp = 8;
 
             copy2.remap.comp_size = 1;
             copy2.remap.dst[0] = NV90B5_SET_REMAP_COMPONENTS_DST_X_SRC_X;
@@ -583,10 +577,12 @@ nvk_CmdCopyImage2(VkCommandBuffer commandBuffer,
       const struct nil_extent4d extent4d_px =
          vk_to_nil_extent(extent_px, region->srcSubresource.layerCount);
 
-      const VkImageAspectFlagBits src_aspects = region->srcSubresource.aspectMask;
+      const VkImageAspectFlagBits src_aspects =
+         region->srcSubresource.aspectMask;
       uint8_t src_plane = nvk_image_aspects_to_plane(src, src_aspects);
 
-      const VkImageAspectFlagBits dst_aspects = region->dstSubresource.aspectMask;
+      const VkImageAspectFlagBits dst_aspects =
+         region->dstSubresource.aspectMask;
       uint8_t dst_plane = nvk_image_aspects_to_plane(dst, dst_aspects);
 
       struct nouveau_copy copy = {

diff --git a/src/nouveau/vulkan/nvk_cmd_dispatch.c b/src/nouveau/vulkan/nvk_cmd_dispatch.c
index d55a13a..53a0042 100644 (file)
--- a/src/nouveau/vulkan/nvk_cmd_dispatch.c
+++ b/src/nouveau/vulkan/nvk_cmd_dispatch.c
@@ -10,14 +10,14 @@
 
 #include "classes/cla0b5.h"
 
-#include "nvk_cl9097.h"
-#include "nvk_cla0c0.h"
 #include "cla1c0.h"
 #include "clc0c0.h"
 #include "clc5c0.h"
-#include "nvk_clc6c0.h"
+#include "nvk_cl9097.h"
+#include "nvk_cla0c0.h"
 #include "nvk_clc3c0.h"
 #include "nvk_clc597.h"
+#include "nvk_clc6c0.h"
 
 #include "drf.h"
 #include "cla0c0qmd.h"
@@ -96,7 +96,7 @@ nvc0c0_cp_launch_desc_set_cb(uint32_t *qmd, unsigned index,
    NVC0C0_QMDV02_01_VAL_SET(qmd, CONSTANT_BUFFER_ADDR_LOWER, index, address);
    NVC0C0_QMDV02_01_VAL_SET(qmd, CONSTANT_BUFFER_ADDR_UPPER, index, address >> 32);
    NVC0C0_QMDV02_01_VAL_SET(qmd, CONSTANT_BUFFER_SIZE_SHIFTED4, index,
-                                 DIV_ROUND_UP(size, 16));
+                            DIV_ROUND_UP(size, 16));
    NVC0C0_QMDV02_01_DEF_SET(qmd, CONSTANT_BUFFER_VALID, index, TRUE);
 }
 
@@ -107,7 +107,7 @@ nvc6c0_cp_launch_desc_set_cb(uint32_t *qmd, unsigned index,
    NVC6C0_QMDV03_00_VAL_SET(qmd, CONSTANT_BUFFER_ADDR_LOWER, index, address);
    NVC6C0_QMDV03_00_VAL_SET(qmd, CONSTANT_BUFFER_ADDR_UPPER, index, address >> 32);
    NVC6C0_QMDV03_00_VAL_SET(qmd, CONSTANT_BUFFER_SIZE_SHIFTED4, index,
-                                 DIV_ROUND_UP(size, 16));
+                            DIV_ROUND_UP(size, 16));
    NVC6C0_QMDV03_00_DEF_SET(qmd, CONSTANT_BUFFER_VALID, index, TRUE);
 }