radv: minor pahole related improvements.

This just reduces the structs by 4-8 bytes each.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/amd/vulkan/radv_descriptor_set.h b/src/amd/vulkan/radv_descriptor_set.h
index 3aa07511d6256265bf914504403e1090927d4a24..4b63992b2bb038b2e36777fe9b3b08cfc2dc8538 100644 (file)
--- a/src/amd/vulkan/radv_descriptor_set.h
+++ b/src/amd/vulkan/radv_descriptor_set.h
@@ -38,9 +38,9 @@ struct radv_descriptor_set_binding_layout {
    uint32_t buffer_offset;
    uint16_t dynamic_offset_offset;
 
+   uint16_t dynamic_offset_count;
    /* redundant with the type, each for a single array element */
    uint32_t size;
-   uint16_t dynamic_offset_count;
 
    /* Offset in the radv_descriptor_set_layout of the immutable samplers, or 0
     * if there are no immutable samplers. */

diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 77592de3bdb986843ba8a8d6f382e586f740bdd6..5028bf507b3ee45ea08e58f93e13d900b3051ceb 100644 (file)
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -794,8 +794,6 @@ struct radv_cmd_buffer {
 
        struct radv_cmd_buffer_upload upload;
 
-       bool record_fail;
-
        uint32_t scratch_size_needed;
        uint32_t compute_scratch_size_needed;
        uint32_t esgs_ring_size_needed;
@@ -803,6 +801,8 @@ struct radv_cmd_buffer {
        bool tess_rings_needed;
        bool sample_positions_needed;
 
+       bool record_fail;
+
        int ring_offsets_idx; /* just used for verification */
 };
 
@@ -1356,8 +1356,8 @@ struct radv_subpass_barrier {
 
 struct radv_subpass {
        uint32_t                                     input_count;
-       VkAttachmentReference *                      input_attachments;
        uint32_t                                     color_count;
+       VkAttachmentReference *                      input_attachments;
        VkAttachmentReference *                      color_attachments;
        VkAttachmentReference *                      resolve_attachments;
        VkAttachmentReference                        depth_stencil_attachment;

diff --git a/src/amd/vulkan/radv_radeon_winsys.h b/src/amd/vulkan/radv_radeon_winsys.h
index 91c6bff72e265dbb9660fd92050437e4549451f3..84b1d73780bb1f6351a3cb3a0b716a2435e942eb 100644 (file)
--- a/src/amd/vulkan/radv_radeon_winsys.h
+++ b/src/amd/vulkan/radv_radeon_winsys.h
@@ -172,9 +172,9 @@ struct radeon_surf_level {
        uint32_t                    nblk_z;
        uint32_t                    pitch_bytes;
        uint32_t                    mode;
+       bool                        dcc_enabled;
        uint64_t                    dcc_offset;
        uint64_t                    dcc_fast_clear_size;
-       bool                        dcc_enabled;
 };