ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Struct reordering/alignment

This commit is contained in:
twinaphex 2020-08-14 21:09:24 +02:00
parent 10b06ce828
commit 7bb63a213c
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gfx/gfx_display.h
View File

@ -153,28 +153,28 @@ struct gfx_display_ctx_draw
const void *backend_data; const void *backend_data;
struct video_coords *coords; struct video_coords *coords;
void *matrix_data; void *matrix_data;
enum gfx_display_prim_type prim_type; uintptr_t texture;
bool pipeline_active; size_t vertex_count;
size_t backend_data_size;
unsigned width;
unsigned height;
unsigned pipeline_id;
float x; float x;
float y; float y;
float rotation; float rotation;
float scale_factor; float scale_factor;
unsigned width; enum gfx_display_prim_type prim_type;
unsigned height; bool pipeline_active;
unsigned pipeline_id;
uintptr_t texture;
size_t vertex_count;
size_t backend_data_size;
}; };
typedef struct gfx_display_ctx_rotate_draw typedef struct gfx_display_ctx_rotate_draw
{ {
bool scale_enable; math_matrix_4x4 *matrix;
float rotation; float rotation;
float scale_x; float scale_x;
float scale_y; float scale_y;
float scale_z; float scale_z;
math_matrix_4x4 *matrix; bool scale_enable;
} gfx_display_ctx_rotate_draw_t; } gfx_display_ctx_rotate_draw_t;
typedef struct gfx_display_ctx_coord_draw typedef struct gfx_display_ctx_coord_draw
@ -201,22 +201,22 @@ typedef struct gfx_display_ctx_powerstate
struct gfx_display struct gfx_display
{ {
bool has_windowed; gfx_display_ctx_driver_t *dispctx;
bool msg_force; video_coord_array_t dispca; /* ptr alignment */
bool framebuf_dirty;
/* Width, height and pitch of the display framebuffer */ /* Width, height and pitch of the display framebuffer */
size_t framebuf_pitch;
unsigned framebuf_width; unsigned framebuf_width;
unsigned framebuf_height; unsigned framebuf_height;
size_t framebuf_pitch;
/* Height of the display header */ /* Height of the display header */
unsigned header_height; unsigned header_height;
enum menu_driver_id_type menu_driver_id; enum menu_driver_id_type menu_driver_id;
video_coord_array_t dispca; bool has_windowed;
gfx_display_ctx_driver_t *dispctx; bool msg_force;
bool framebuf_dirty;
}; };
typedef struct gfx_display gfx_display_t; typedef struct gfx_display gfx_display_t;

8
retroarch.c
View File

@ -2089,12 +2089,13 @@ struct rarch_state
const struct retro_keybind *libretro_input_binds[MAX_USERS]; const struct retro_keybind *libretro_input_binds[MAX_USERS];
core_info_state_t core_info_st; /* ptr alignment */ core_info_state_t core_info_st; /* ptr alignment */
rarch_system_info_t runloop_system; /* ptr alignment */ rarch_system_info_t runloop_system; /* ptr alignment */
struct retro_hw_render_callback hw_render; /* ptr alignment */ struct retro_hw_render_callback hw_render; /* ptr alignment */
#ifdef HAVE_BSV_MOVIE #ifdef HAVE_BSV_MOVIE
bsv_movie_t *bsv_movie_state_handle; /* ptr alignment */ bsv_movie_t *bsv_movie_state_handle; /* ptr alignment */
#endif #endif
gfx_display_t dispgfx; /* ptr alignment */
/*************************************/ /*************************************/
/* TODO/FIXME BEGIN - find alignment */ /* TODO/FIXME BEGIN - find alignment */
@ -2160,7 +2161,6 @@ struct rarch_state
#ifdef HAVE_DISCORD #ifdef HAVE_DISCORD
discord_state_t discord_st; discord_state_t discord_st;
#endif #endif
gfx_display_t dispgfx;
struct retro_callbacks retro_ctx; struct retro_callbacks retro_ctx;
struct retro_core_t current_core; struct retro_core_t current_core;