diff --git a/src/imagination/.clang-format b/src/imagination/.clang-format
index db00dca2cde..b3fc44e702e 100644
--- a/src/imagination/.clang-format
+++ b/src/imagination/.clang-format
@@ -232,7 +232,8 @@ ForEachMacros: [
   'vk_foreach_struct_const',
 # FIXME: vk_outarray_append doesn't fit here, remove
 # it when a better solution exists for it.
-  'vk_outarray_append'
+  'vk_outarray_append',
+  'vk_outarray_append_typed'
 ]
 
 NamespaceMacros: [
diff --git a/src/imagination/vulkan/pvr_device.c b/src/imagination/vulkan/pvr_device.c
index 0049fa08e3d..2e40b076764 100644
--- a/src/imagination/vulkan/pvr_device.c
+++ b/src/imagination/vulkan/pvr_device.c
@@ -509,9 +509,11 @@ VkResult pvr_EnumeratePhysicalDevices(VkInstance _instance,
                                       uint32_t *pPhysicalDeviceCount,
                                       VkPhysicalDevice *pPhysicalDevices)
 {
+   VK_OUTARRAY_MAKE_TYPED(VkPhysicalDevice,
+                          out,
+                          pPhysicalDevices,
+                          pPhysicalDeviceCount);
    PVR_FROM_HANDLE(pvr_instance, instance, _instance);
-   VK_OUTARRAY_MAKE_TYPED(VkPhysicalDevice, out,
-                          pPhysicalDevices, pPhysicalDeviceCount);
    VkResult result;
 
    if (instance->physical_devices_count < 0) {
@@ -524,7 +526,7 @@ VkResult pvr_EnumeratePhysicalDevices(VkInstance _instance,
       return VK_SUCCESS;
 
    assert(instance->physical_devices_count == 1);
-   vk_outarray_append_typed(VkPhysicalDevice, &out, p) {
+   vk_outarray_append_typed (VkPhysicalDevice, &out, p) {
       *p = pvr_physical_device_to_handle(&instance->physical_device);
    }
 
@@ -850,9 +852,12 @@ void pvr_GetPhysicalDeviceQueueFamilyProperties(
    uint32_t *pCount,
    VkQueueFamilyProperties *pQueueFamilyProperties)
 {
-   VK_OUTARRAY_MAKE_TYPED(VkQueueFamilyProperties, out, pQueueFamilyProperties, pCount);
+   VK_OUTARRAY_MAKE_TYPED(VkQueueFamilyProperties,
+                          out,
+                          pQueueFamilyProperties,
+                          pCount);
 
-   vk_outarray_append_typed(VkQueueFamilyProperties, &out, p) {
+   vk_outarray_append_typed (VkQueueFamilyProperties, &out, p) {
       *p = pvr_queue_family_properties;
    }
 }
@@ -862,9 +867,12 @@ void pvr_GetPhysicalDeviceQueueFamilyProperties2(
    uint32_t *pQueueFamilyPropertyCount,
    VkQueueFamilyProperties2 *pQueueFamilyProperties)
 {
-   VK_OUTARRAY_MAKE_TYPED(VkQueueFamilyProperties2, out, pQueueFamilyProperties, pQueueFamilyPropertyCount);
+   VK_OUTARRAY_MAKE_TYPED(VkQueueFamilyProperties2,
+                          out,
+                          pQueueFamilyProperties,
+                          pQueueFamilyPropertyCount);
 
-   vk_outarray_append_typed(VkQueueFamilyProperties2, &out, p) {
+   vk_outarray_append_typed (VkQueueFamilyProperties2, &out, p) {
       p->queueFamilyProperties = pvr_queue_family_properties;
 
       vk_foreach_struct (ext, p->pNext) {