Mesa (main): iris: Improve the memory layout of iris_bo by fixing pahole issues

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 0707a1d8423538b1a2e04b20e7dfd2ee7ad5a8c4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0707a1d8423538b1a2e04b20e7dfd2ee7ad5a8c4

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Jul 19 21:30:21 2021 -0700

iris: Improve the memory layout of iris_bo by fixing pahole issues

We had a 4 byte hole and a 4-byte field breaking up a run of bools.

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12206>

---

 src/gallium/drivers/iris/iris_bufmgr.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_bufmgr.h b/src/gallium/drivers/iris/iris_bufmgr.h
index 0807608fa37..0e4ecf2def3 100644
--- a/src/gallium/drivers/iris/iris_bufmgr.h
+++ b/src/gallium/drivers/iris/iris_bufmgr.h
@@ -186,6 +186,9 @@ struct iris_bo {
     */
    unsigned global_name;
 
+   /** The mmap coherency mode selected at BO allocation time */
+   enum iris_mmap_mode mmap_mode;
+
    time_t free_time;
 
    /** Mapped address for the buffer, saved across map/unmap cycles */
@@ -234,9 +237,6 @@ struct iris_bo {
     */
    bool userptr;
 
-   /** The mmap coherency mode selected at BO allocation time */
-   enum iris_mmap_mode mmap_mode;
-
    /**
     * Boolean of whether this was allocated from local memory
     */