From 7ea2111936316fa9e08b53293f469d6d452e06f2 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 14 Aug 2020 18:36:09 +0200
Subject: [PATCH] Struct reorderings

---
 gfx/gfx_widgets.h       | 7 +++----
 gfx/video_coord_array.h | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/gfx/gfx_widgets.h b/gfx/gfx_widgets.h
index d244a4ebf5..1ba3e99415 100644
--- a/gfx/gfx_widgets.h
+++ b/gfx/gfx_widgets.h
@@ -90,13 +90,13 @@ enum notification_show_screenshot_flash
 typedef struct
 {
    font_data_t *font;
-   video_font_raster_block_t raster_block;
+   video_font_raster_block_t raster_block; /* ptr alignment */
+   size_t usage_count;
    unsigned glyph_width;
    float line_height;
    float line_ascender;
    float line_descender;
    float line_centre_offset;
-   size_t usage_count;
 } gfx_widget_font_data_t;
 
 /* Font data */
@@ -161,6 +161,7 @@ typedef struct dispgfx_widget
 #endif
    fifo_buffer_t *msg_queue;
    disp_widget_msg_t* current_msgs[MSG_QUEUE_ONSCREEN_MAX];
+   gfx_widget_fonts_t gfx_widget_fonts; /* ptr alignment */
 
 #ifdef HAVE_TRANSLATE
    uintptr_t ai_service_overlay_texture;
@@ -214,8 +215,6 @@ typedef struct dispgfx_widget
    unsigned ai_service_overlay_height;
 #endif
 
-   gfx_widget_fonts_t gfx_widget_fonts;
-
    char gfx_widgets_status_text[255];
 
    /* There can only be one message animation at a time to 
diff --git a/gfx/video_coord_array.h b/gfx/video_coord_array.h
index 1dee18db50..7da34d3523 100644
--- a/gfx/video_coord_array.h
+++ b/gfx/video_coord_array.h
@@ -59,8 +59,8 @@ typedef struct video_coords
    const float *color;
    const float *tex_coord;
    const float *lut_tex_coord;
-   unsigned vertices;
    const unsigned *index;
+   unsigned vertices;
    unsigned indexes;
 } video_coords_t;
 
@@ -77,14 +77,14 @@ typedef struct video_mut_coords
 
 typedef struct video_coord_array
 {
-   video_mut_coords_t coords;
+   video_mut_coords_t coords; /* ptr alignment */
    unsigned allocated;
 } video_coord_array_t;
 
 typedef struct video_font_raster_block
 {
+   video_coord_array_t carr; /* ptr alignment */
    bool fullscreen;
-   video_coord_array_t carr;
 } video_font_raster_block_t;
 
 bool video_coord_array_append(video_coord_array_t *ca,