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

Reorder structs, alignment

This commit is contained in:
twinaphex 2020-08-18 16:51:00 +02:00
parent b1d28fd7e0
commit 21855dfb85
2 changed files with 101 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
audio/audio_thread_wrapper.c
View File

@ -34,6 +34,13 @@ typedef struct audio_thread
const char *device;
unsigned *new_rate;
int inited;
/* Initialization options. */
unsigned out_rate;
unsigned latency;
unsigned block_frames;
bool alive;
bool stopped;
bool stopped_ack;
@ -41,12 +48,6 @@ typedef struct audio_thread
bool is_shutdown;
bool use_float;
int inited;
/* Initialization options. */
unsigned out_rate;
unsigned latency;
unsigned block_frames;
} audio_thread_t;
static void audio_thread_loop(void *data)

165
gfx/video_thread_wrapper.c
View File

@ -65,14 +65,13 @@ enum thread_cmd
struct thread_packet
{
enum thread_cmd type;
union
{
bool b;
int i;
float f;
const char *str;
void *v;
int i;
float f;
bool b;
struct
{
@ -146,10 +145,13 @@ struct thread_packet
enum font_driver_render_api api;
} font_init;
} data;
enum thread_cmd type;
};
struct thread_video
{
retro_time_t last_time;
slock_t *lock;
scond_t *cond_cmd;
scond_t *cond_thread;
@ -167,6 +169,10 @@ struct thread_video
input_driver_t **input;
void **input_data;
float *alpha_mod;
slock_t *alpha_lock;
void (*send_and_wait)(struct thread_video *, thread_packet_t*);
struct
{
void *frame;
@ -179,6 +185,37 @@ struct thread_video
bool enable;
bool full_screen;
} texture;
unsigned hit_count;
unsigned miss_count;
unsigned alpha_mods;
struct video_viewport vp;
struct video_viewport read_vp; /* Last viewport reported to caller. */
thread_packet_t cmd_data;
video_driver_t video_thread;
enum thread_cmd send_cmd;
enum thread_cmd reply_cmd;
bool alpha_update;
struct
{
uint64_t count;
slock_t *lock;
uint8_t *buffer;
unsigned width;
unsigned height;
unsigned pitch;
char msg[255];
bool updated;
bool within_thread;
} frame;
bool apply_state_changes;
bool alive;
@ -187,39 +224,6 @@ struct thread_video
bool has_windowed;
bool nonblock;
bool is_idle;
retro_time_t last_time;
unsigned hit_count;
unsigned miss_count;
float *alpha_mod;
unsigned alpha_mods;
bool alpha_update;
slock_t *alpha_lock;
void (*send_and_wait)(struct thread_video *, thread_packet_t*);
enum thread_cmd send_cmd;
enum thread_cmd reply_cmd;
thread_packet_t cmd_data;
struct video_viewport vp;
struct video_viewport read_vp; /* Last viewport reported to caller. */
struct
{
slock_t *lock;
uint8_t *buffer;
unsigned width;
unsigned height;
unsigned pitch;
bool updated;
bool within_thread;
uint64_t count;
char msg[255];
} frame;
video_driver_t video_thread;
};
static void *video_thread_init_never_call(const video_info_t *video,
@ -649,8 +653,9 @@ static bool video_thread_alive(void *data)
if (rarch_ctl(RARCH_CTL_IS_PAUSED, NULL))
{
thread_packet_t pkt = { CMD_ALIVE };
thread_packet_t pkt;
pkt.type = CMD_ALIVE;
video_thread_send_and_wait_user_to_thread(thr, &pkt);
return pkt.data.b;
}
@ -804,7 +809,9 @@ static bool video_thread_init(thread_video_t *thr,
input_driver_t **input, void **input_data)
{
size_t max_size;
thread_packet_t pkt = {CMD_INIT};
thread_packet_t pkt;
pkt.type = CMD_INIT;
thr->lock = slock_new();
thr->alpha_lock = slock_new();
@ -844,11 +851,12 @@ static bool video_thread_init(thread_video_t *thr,
static bool video_thread_set_shader(void *data,
enum rarch_shader_type type, const char *path)
{
thread_packet_t pkt;
thread_video_t *thr = (thread_video_t*)data;
thread_packet_t pkt = {CMD_SET_SHADER};
if (!thr)
return false;
pkt.type = CMD_SET_SHADER;
pkt.data.set_shader.type = type;
pkt.data.set_shader.path = path;
@ -875,13 +883,14 @@ static void video_thread_set_viewport(void *data, unsigned width,
static void video_thread_set_rotation(void *data, unsigned rotation)
{
thread_packet_t pkt;
thread_video_t *thr = (thread_video_t*)data;
thread_packet_t pkt = { CMD_SET_ROTATION };
if (!thr)
return;
pkt.data.i = rotation;
pkt.type = CMD_SET_ROTATION;
pkt.data.i = rotation;
video_thread_send_and_wait_user_to_thread(thr, &pkt);
}
@ -906,16 +915,18 @@ static void video_thread_viewport_info(void *data, struct video_viewport *vp)
slock_unlock(thr->lock);
}
static bool video_thread_read_viewport(void *data, uint8_t *buffer, bool is_idle)
static bool video_thread_read_viewport(void *data,
uint8_t *buffer, bool is_idle)
{
thread_packet_t pkt;
thread_video_t *thr = (thread_video_t*)data;
thread_packet_t pkt = { CMD_READ_VIEWPORT };
if (!thr)
return false;
pkt.data.v = buffer;
thr->is_idle = is_idle;
pkt.type = CMD_READ_VIEWPORT;
pkt.data.v = buffer;
thr->is_idle = is_idle;
video_thread_send_and_wait_user_to_thread(thr, &pkt);
@ -924,12 +935,13 @@ static bool video_thread_read_viewport(void *data, uint8_t *buffer, bool is_idle
static void video_thread_free(void *data)
{
thread_packet_t pkt;
thread_video_t *thr = (thread_video_t*)data;
thread_packet_t pkt = { CMD_FREE };
if (!thr)
return;
pkt.type = CMD_FREE;
video_thread_send_and_wait_user_to_thread(thr, &pkt);
sthread_join(thr->thread);
@ -955,13 +967,14 @@ static void video_thread_free(void *data)
#ifdef HAVE_OVERLAY
static void thread_overlay_enable(void *data, bool state)
{
thread_packet_t pkt;
thread_video_t *thr = (thread_video_t*)data;
thread_packet_t pkt = { CMD_OVERLAY_ENABLE };
if (!thr)
return;
pkt.data.b = state;
pkt.type = CMD_OVERLAY_ENABLE;
pkt.data.b = state;
video_thread_send_and_wait_user_to_thread(thr, &pkt);
}
@ -969,14 +982,15 @@ static void thread_overlay_enable(void *data, bool state)
static bool thread_overlay_load(void *data,
const void *image_data, unsigned num_images)
{
thread_video_t *thr = (thread_video_t*)data;
thread_packet_t pkt = { CMD_OVERLAY_LOAD };
thread_packet_t pkt;
thread_video_t *thr = (thread_video_t*)data;
const struct texture_image *images =
(const struct texture_image*)image_data;
if (!thr)
return false;
pkt.type = CMD_OVERLAY_LOAD;
pkt.data.image.data = images;
pkt.data.image.num = num_images;
@ -988,16 +1002,17 @@ static bool thread_overlay_load(void *data,
static void thread_overlay_tex_geom(void *data,
unsigned idx, float x, float y, float w, float h)
{
thread_packet_t pkt;
thread_video_t *thr = (thread_video_t*)data;
thread_packet_t pkt = { CMD_OVERLAY_TEX_GEOM };
if (!thr)
return;
pkt.type = CMD_OVERLAY_TEX_GEOM;
pkt.data.rect.index = idx;
pkt.data.rect.x = x;
pkt.data.rect.y = y;
pkt.data.rect.w = w;
pkt.data.rect.h = h;
pkt.data.rect.x = x;
pkt.data.rect.y = y;
pkt.data.rect.w = w;
pkt.data.rect.h = h;
video_thread_send_and_wait_user_to_thread(thr, &pkt);
}
@ -1005,27 +1020,29 @@ static void thread_overlay_tex_geom(void *data,
static void thread_overlay_vertex_geom(void *data,
unsigned idx, float x, float y, float w, float h)
{
thread_packet_t pkt;
thread_video_t *thr = (thread_video_t*)data;
thread_packet_t pkt = { CMD_OVERLAY_VERTEX_GEOM };
if (!thr)
return;
pkt.type = CMD_OVERLAY_VERTEX_GEOM;
pkt.data.rect.index = idx;
pkt.data.rect.x = x;
pkt.data.rect.y = y;
pkt.data.rect.w = w;
pkt.data.rect.h = h;
pkt.data.rect.x = x;
pkt.data.rect.y = y;
pkt.data.rect.w = w;
pkt.data.rect.h = h;
video_thread_send_and_wait_user_to_thread(thr, &pkt);
}
static void thread_overlay_full_screen(void *data, bool enable)
{
thread_packet_t pkt;
thread_video_t *thr = (thread_video_t*)data;
thread_packet_t pkt = { CMD_OVERLAY_FULL_SCREEN };
pkt.data.b = enable;
pkt.type = CMD_OVERLAY_FULL_SCREEN;
pkt.data.b = enable;
video_thread_send_and_wait_user_to_thread(thr, &pkt);
}
@ -1067,12 +1084,13 @@ static void video_thread_get_overlay_interface(void *data,
static void thread_set_video_mode(void *data, unsigned width, unsigned height,
bool video_fullscreen)
{
thread_packet_t pkt;
thread_video_t *thr = (thread_video_t*)data;
thread_packet_t pkt = { CMD_POKE_SET_VIDEO_MODE };
if (!thr)
return;
pkt.type = CMD_POKE_SET_VIDEO_MODE;
pkt.data.new_mode.width = width;
pkt.data.new_mode.height = height;
pkt.data.new_mode.fullscreen = video_fullscreen;
@ -1082,11 +1100,12 @@ static void thread_set_video_mode(void *data, unsigned width, unsigned height,
static void thread_set_filtering(void *data, unsigned idx, bool smooth, bool ctx_scaling)
{
thread_packet_t pkt;
thread_video_t *thr = (thread_video_t*)data;
thread_packet_t pkt = { CMD_POKE_SET_FILTERING };
if (!thr)
return;
pkt.type = CMD_POKE_SET_FILTERING;
pkt.data.filtering.index = idx;
pkt.data.filtering.smooth = smooth;
@ -1131,12 +1150,13 @@ static void thread_get_video_output_next(void *data)
static void thread_set_aspect_ratio(void *data, unsigned aspectratio_idx)
{
thread_packet_t pkt;
thread_video_t *thr = (thread_video_t*)data;
thread_packet_t pkt = { CMD_POKE_SET_ASPECT_RATIO };
if (!thr)
return;
pkt.data.i = aspectratio_idx;
pkt.type = CMD_POKE_SET_ASPECT_RATIO;
pkt.data.i = aspectratio_idx;
video_thread_send_and_wait_user_to_thread(thr, &pkt);
}
@ -1197,24 +1217,26 @@ static void thread_set_osd_msg(void *data,
static void thread_show_mouse(void *data, bool state)
{
thread_packet_t pkt;
thread_video_t *thr = (thread_video_t*)data;
thread_packet_t pkt = { CMD_POKE_SHOW_MOUSE };
if (!thr)
return;
pkt.data.b = state;
pkt.type = CMD_POKE_SHOW_MOUSE;
pkt.data.b = state;
video_thread_send_and_wait_user_to_thread(thr, &pkt);
}
static void thread_grab_mouse_toggle(void *data)
{
thread_packet_t pkt;
thread_video_t *thr = (thread_video_t*)data;
thread_packet_t pkt = { CMD_POKE_GRAB_MOUSE_TOGGLE };
if (!thr)
return;
pkt.type = CMD_POKE_GRAB_MOUSE_TOGGLE;
video_thread_send_and_wait_user_to_thread(thr, &pkt);
}
@ -1477,12 +1499,13 @@ bool video_thread_font_init(const void **font_driver, void **font_handle,
unsigned video_thread_texture_load(void *data,
custom_command_method_t func)
{
thread_packet_t pkt;
thread_video_t *thr = (thread_video_t*)video_driver_get_ptr(true);
thread_packet_t pkt = { CMD_CUSTOM_COMMAND };
if (!thr)
return 0;
pkt.type = CMD_CUSTOM_COMMAND;
pkt.data.custom_command.method = func;
pkt.data.custom_command.data = (void*)data;