From: Dave Airlie <airl...@redhat.com>

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

Signed-off-by: Dave Airlie <airl...@redhat.com>
---
 src/amd/vulkan/radv_descriptor_set.h | 2 +-
 src/amd/vulkan/radv_private.h        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/amd/vulkan/radv_descriptor_set.h 
b/src/amd/vulkan/radv_descriptor_set.h
index 3aa0751..4b63992 100644
--- 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 77592de..5028bf5 100644
--- 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;
-- 
2.9.3

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to