pvr: clang-format fixes

Signed-off-by: Frank Binns <frank.binns@imgtec.com>
Reviewed-by: Karmjit Mahil <Karmjit.Mahil@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24070>

diff --git a/src/imagination/rogue/nir/rogue_nir_lower_io.c b/src/imagination/rogue/nir/rogue_nir_lower_io.c
index f6089e9..45af630 100644 (file)
--- a/src/imagination/rogue/nir/rogue_nir_lower_io.c
+++ b/src/imagination/rogue/nir/rogue_nir_lower_io.c
@@ -67,7 +67,9 @@ static void lower_load_global_constant_to_scalar(nir_builder *b,
    for (uint8_t i = 0; i < intr->num_components; i++) {
       nir_intrinsic_instr *chan_intr =
          nir_intrinsic_instr_create(b->shader, intr->intrinsic);
-      nir_ssa_dest_init(&chan_intr->instr, &chan_intr->dest, 1,
+      nir_ssa_dest_init(&chan_intr->instr,
+                        &chan_intr->dest,
+                        1,
                         intr->dest.ssa.bit_size);
       chan_intr->num_components = 1;
 

diff --git a/src/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c
index b534b91..b2d9090 100644 (file)
--- a/src/imagination/vulkan/pvr_cmd_buffer.c
+++ b/src/imagination/vulkan/pvr_cmd_buffer.c
@@ -3390,7 +3390,8 @@ pvr_setup_vertex_buffers(struct pvr_cmd_buffer *cmd_buffer,
 
          if (binding->buffer->vk.size <
              (attribute->offset + attribute->component_size_in_bytes)) {
-            /* Replace with load from robustness buffer when no attribute is in range
+            /* Replace with load from robustness buffer when no attribute is in
+             * range
              */
             addr = PVR_DEV_ADDR_OFFSET(
                cmd_buffer->device->robustness_buffer->vma->dev_addr,

diff --git a/src/imagination/vulkan/pvr_pipeline.c b/src/imagination/vulkan/pvr_pipeline.c
index 7a1d68e..bd9cc0f 100644 (file)
--- a/src/imagination/vulkan/pvr_pipeline.c
+++ b/src/imagination/vulkan/pvr_pipeline.c
@@ -2284,7 +2284,8 @@ pvr_graphics_pipeline_init(struct pvr_device *device,
 {
    struct vk_dynamic_graphics_state *const dynamic_state =
       &gfx_pipeline->dynamic_state;
-   const struct vk_render_pass_state rp_state = pvr_create_renderpass_state(pCreateInfo);
+   const struct vk_render_pass_state rp_state =
+      pvr_create_renderpass_state(pCreateInfo);
 
    struct vk_graphics_pipeline_all_state all_state;
    struct vk_graphics_pipeline_state state = { 0 };

diff --git a/src/imagination/vulkan/pvr_robustness.c b/src/imagination/vulkan/pvr_robustness.c
index 74f196d..ef67a2e 100644 (file)
--- a/src/imagination/vulkan/pvr_robustness.c
+++ b/src/imagination/vulkan/pvr_robustness.c
@@ -96,10 +96,12 @@ VkResult pvr_init_robustness_buffer(struct pvr_device *device)
    robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_SFLOAT16] = offset;
    offset = ROBUSTNESS_BUFFER_OFFSET_ALIGN16(offset, sizeof(uint16_t) * 4);
 
-   robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_A8B8G8R8_UINT] = offset;
+   robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_A8B8G8R8_UINT] =
+      offset;
    offset = ROBUSTNESS_BUFFER_OFFSET_ALIGN16(offset, 4);
 
-   robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_A8B8G8R8_SINT] = offset;
+   robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_A8B8G8R8_SINT] =
+      offset;
    offset = ROBUSTNESS_BUFFER_OFFSET_ALIGN16(offset, 4);
 
    robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_A2R10G10B10_UINT] =
@@ -110,13 +112,16 @@ VkResult pvr_init_robustness_buffer(struct pvr_device *device)
       offset;
    offset = ROBUSTNESS_BUFFER_OFFSET_ALIGN16(offset, 4);
 
-   robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_R4G4B4A4_UNORM] = offset;
+   robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_R4G4B4A4_UNORM] =
+      offset;
    offset = ROBUSTNESS_BUFFER_OFFSET_ALIGN16(offset, 2);
 
-   robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_R5G5B5A1_UNORM] = offset;
+   robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_R5G5B5A1_UNORM] =
+      offset;
    offset = ROBUSTNESS_BUFFER_OFFSET_ALIGN16(offset, 2);
 
-   robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_A1R5G5B5_UNORM] = offset;
+   robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_A1R5G5B5_UNORM] =
+      offset;
    offset = ROBUSTNESS_BUFFER_OFFSET_ALIGN16(offset, 2);
 
 #undef ROBUSTNESS_BUFFER_OFFSET_ALIGN16
@@ -299,12 +304,14 @@ uint16_t pvr_get_robustness_buffer_format_offset(VkFormat format)
    case VK_FORMAT_A8B8G8R8_USCALED_PACK32:
    case VK_FORMAT_A8B8G8R8_UINT_PACK32:
    case VK_FORMAT_A8B8G8R8_SRGB_PACK32:
-      return robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_A8B8G8R8_UINT];
+      return robustness_buffer_offsets
+         [PVR_ROBUSTNESS_BUFFER_FORMAT_A8B8G8R8_UINT];
 
    case VK_FORMAT_A8B8G8R8_SNORM_PACK32:
    case VK_FORMAT_A8B8G8R8_SSCALED_PACK32:
    case VK_FORMAT_A8B8G8R8_SINT_PACK32:
-      return robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_A8B8G8R8_SINT];
+      return robustness_buffer_offsets
+         [PVR_ROBUSTNESS_BUFFER_FORMAT_A8B8G8R8_SINT];
 
    case VK_FORMAT_A2R10G10B10_UNORM_PACK32:
    case VK_FORMAT_A2R10G10B10_USCALED_PACK32:
@@ -312,7 +319,8 @@ uint16_t pvr_get_robustness_buffer_format_offset(VkFormat format)
    case VK_FORMAT_A2B10G10R10_UNORM_PACK32:
    case VK_FORMAT_A2B10G10R10_USCALED_PACK32:
    case VK_FORMAT_A2B10G10R10_UINT_PACK32:
-      return robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_A2R10G10B10_UINT];
+      return robustness_buffer_offsets
+         [PVR_ROBUSTNESS_BUFFER_FORMAT_A2R10G10B10_UINT];
 
    case VK_FORMAT_A2R10G10B10_SNORM_PACK32:
    case VK_FORMAT_A2R10G10B10_SSCALED_PACK32:
@@ -320,18 +328,22 @@ uint16_t pvr_get_robustness_buffer_format_offset(VkFormat format)
    case VK_FORMAT_A2B10G10R10_SNORM_PACK32:
    case VK_FORMAT_A2B10G10R10_SSCALED_PACK32:
    case VK_FORMAT_A2B10G10R10_SINT_PACK32:
-      return robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_A2R10G10B10_SINT];
+      return robustness_buffer_offsets
+         [PVR_ROBUSTNESS_BUFFER_FORMAT_A2R10G10B10_SINT];
 
    case VK_FORMAT_R4G4B4A4_UNORM_PACK16:
    case VK_FORMAT_B4G4R4A4_UNORM_PACK16:
-      return robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_R4G4B4A4_UNORM];
+      return robustness_buffer_offsets
+         [PVR_ROBUSTNESS_BUFFER_FORMAT_R4G4B4A4_UNORM];
 
    case VK_FORMAT_R5G5B5A1_UNORM_PACK16:
    case VK_FORMAT_B5G5R5A1_UNORM_PACK16:
-      return robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_R5G5B5A1_UNORM];
+      return robustness_buffer_offsets
+         [PVR_ROBUSTNESS_BUFFER_FORMAT_R5G5B5A1_UNORM];
 
    case VK_FORMAT_A1R5G5B5_UNORM_PACK16:
-      return robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_A1R5G5B5_UNORM];
+      return robustness_buffer_offsets
+         [PVR_ROBUSTNESS_BUFFER_FORMAT_A1R5G5B5_UNORM];
 
    default:
       return robustness_buffer_offsets[PVR_ROBUSTNESS_BUFFER_FORMAT_UINT64];

diff --git a/src/imagination/vulkan/usc/pvr_uscgen.c b/src/imagination/vulkan/usc/pvr_uscgen.c
index abae592..0ed14cb 100644 (file)
--- a/src/imagination/vulkan/usc/pvr_uscgen.c
+++ b/src/imagination/vulkan/usc/pvr_uscgen.c
@@ -29,12 +29,13 @@
 
 #include <stdbool.h>
 
-void pvr_uscgen_per_job_eot(uint32_t emit_count,
-                            const uint32_t *emit_state, /* Expects emit_count *
-                                                           ROGUE_NUM_PBESTATE_STATE_WORDS
-                                                           entries */
-                            unsigned *temps_used,
-                            struct util_dynarray *binary)
+void pvr_uscgen_per_job_eot(
+   uint32_t emit_count,
+   const uint32_t *emit_state, /* Expects emit_count *
+                                  ROGUE_NUM_PBESTATE_STATE_WORDS
+                                  entries */
+   unsigned *temps_used,
+   struct util_dynarray *binary)
 {
    rogue_builder b;
    rogue_shader *shader = rogue_shader_create(NULL, MESA_SHADER_NONE);