mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 19:20:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of video_context_driver_set_video_mode

Browse Source
This commit is contained in:
twinaphex 2020-07-27 11:08:34 +02:00
parent 197465c1ea
commit 61b798b789
7 changed files with 35 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gfx/drivers/gl.c
View File

@ -2106,13 +2106,10 @@ static void gl2_set_rotation(void *data, unsigned rotation)
static void gl2_set_video_mode(void *data, unsigned width, unsigned height, static void gl2_set_video_mode(void *data, unsigned width, unsigned height,
bool fullscreen) bool fullscreen)
{ {
gfx_ctx_mode_t mode; gl_t *gl = (gl_t*)data;
if (gl->ctx_driver->set_video_mode)
mode.width = width; gl->ctx_driver->set_video_mode(gl->ctx_data,
mode.height = height; width, height, fullscreen);
mode.fullscreen = fullscreen;
video_context_driver_set_video_mode(&mode);
} }
static void gl2_update_input_size(gl_t *gl, unsigned width, static void gl2_update_input_size(gl_t *gl, unsigned width,
@ -3616,8 +3613,6 @@ static void *gl2_init(const video_info_t *video,
#endif #endif
full_x = mode.width; full_x = mode.width;
full_y = mode.height; full_y = mode.height;
mode.width = 0;
mode.height = 0;
interval = 0; interval = 0;
RARCH_LOG("[GL]: Detecting screen resolution %ux%u.\n", full_x, full_y); RARCH_LOG("[GL]: Detecting screen resolution %ux%u.\n", full_x, full_y);
@ -3643,16 +3638,16 @@ static void *gl2_init(const video_info_t *video,
win_height = full_y; win_height = full_y;
} }
mode.width = win_width; if ( !gl->ctx_driver->set_video_mode
mode.height = win_height; || !gl->ctx_driver->set_video_mode(gl->ctx_data,
mode.fullscreen = video->fullscreen; win_width, win_height, video->fullscreen))
if (!video_context_driver_set_video_mode(&mode))
goto error; goto error;
#if defined(__APPLE__) && !defined(IOS) #if defined(__APPLE__) && !defined(IOS)
/* This is a hack for now to work around a very annoying /* This is a hack for now to work around a very annoying
* issue that currently eludes us. */ * issue that currently eludes us. */
if (!video_context_driver_set_video_mode(&mode)) if ( !gl->ctx_driver->set_video_mode
|| !gl->ctx_driver->set_video_mode(gl->ctx_data,
win_width, win_height, video->fullscreen))
goto error; goto error;
#endif #endif
@ -3771,8 +3766,6 @@ static void *gl2_init(const video_info_t *video,
#endif #endif
temp_width = mode.width; temp_width = mode.width;
temp_height = mode.height; temp_height = mode.height;
mode.width = 0;
mode.height = 0;
/* Get real known video size, which might have been altered by context. */ /* Get real known video size, which might have been altered by context. */

17
gfx/drivers/gl1.c
View File

@ -316,7 +316,9 @@ static void *gl1_gfx_init(const video_info_t *video,
ctx_driver->swap_interval(gl1->ctx_data, interval); ctx_driver->swap_interval(gl1->ctx_data, interval);
} }
if (!video_context_driver_set_video_mode(&mode)) if ( !gl1->ctx_driver->set_video_mode
|| !gl1->ctx_driver->set_video_mode(gl1->ctx_data,
win_width, win_height, video->fullscreen))
goto error; goto error;
gl1->fullscreen = video->fullscreen; gl1->fullscreen = video->fullscreen;
@ -328,8 +330,6 @@ static void *gl1_gfx_init(const video_info_t *video,
temp_width = mode.width; temp_width = mode.width;
temp_height = mode.height; temp_height = mode.height;
mode.width = 0;
mode.height = 0;
/* Get real known video size, which might have been altered by context. */ /* Get real known video size, which might have been altered by context. */
@ -1187,13 +1187,10 @@ static void gl1_get_video_output_next(void *data)
static void gl1_set_video_mode(void *data, unsigned width, unsigned height, static void gl1_set_video_mode(void *data, unsigned width, unsigned height,
bool fullscreen) bool fullscreen)
{ {
gfx_ctx_mode_t mode; gl1_t *gl = (gl1_t*)data;
if (gl->ctx_driver->set_video_mode)
mode.width = width; gl->ctx_driver->set_video_mode(gl->ctx_data,
mode.height = height; width, height, fullscreen);
mode.fullscreen = fullscreen;
video_context_driver_set_video_mode(&mode);
} }
static unsigned gl1_wrap_type_to_enum(enum gfx_wrap_type type) static unsigned gl1_wrap_type_to_enum(enum gfx_wrap_type type)

22
gfx/drivers/gl_core.c
View File

@ -1211,11 +1211,9 @@ static void *gl_core_init(const video_info_t *video,
win_height = full_y; win_height = full_y;
} }
mode.width = win_width; if ( !gl->ctx_driver->set_video_mode
mode.height = win_height; || !gl->ctx_driver->set_video_mode(gl->ctx_data,
mode.fullscreen = video->fullscreen; win_width, win_height, video->fullscreen))
if (!video_context_driver_set_video_mode(&mode))
goto error; goto error;
gl_core_context_bind_hw_render(gl, false); gl_core_context_bind_hw_render(gl, false);
@ -1290,9 +1288,6 @@ static void *gl_core_init(const video_info_t *video,
temp_width = mode.width; temp_width = mode.width;
temp_height = mode.height; temp_height = mode.height;
mode.width = 0;
mode.height = 0;
/* Get real known video size, which might have been altered by context. */ /* Get real known video size, which might have been altered by context. */
if (temp_width != 0 && temp_height != 0) if (temp_width != 0 && temp_height != 0)
@ -2124,13 +2119,10 @@ static void gl_core_unload_texture(void *data, bool threaded,
static void gl_core_set_video_mode(void *data, unsigned width, unsigned height, static void gl_core_set_video_mode(void *data, unsigned width, unsigned height,
bool fullscreen) bool fullscreen)
{ {
gfx_ctx_mode_t mode; gl_core_t *gl = (gl_core_t*)data;
if (gl->ctx_driver->set_video_mode)
mode.width = width; gl->ctx_driver->set_video_mode(gl->ctx_data,
mode.height = height; width, height, fullscreen);
mode.fullscreen = fullscreen;
video_context_driver_set_video_mode(&mode);
} }
static void gl_core_show_mouse(void *data, bool state) static void gl_core_show_mouse(void *data, bool state)

12
gfx/drivers/vg.c
View File

@ -142,8 +142,6 @@ static void *vg_init(const video_info_t *video,
temp_width = mode.width; temp_width = mode.width;
temp_height = mode.height; temp_height = mode.height;
mode.width = 0;
mode.height = 0;
RARCH_LOG("[VG]: Detecting screen resolution %ux%u.\n", temp_width, temp_height); RARCH_LOG("[VG]: Detecting screen resolution %ux%u.\n", temp_width, temp_height);
@ -173,11 +171,9 @@ static void *vg_init(const video_info_t *video,
win_height = temp_height; win_height = temp_height;
} }
mode.width = win_width; if ( !vg->ctx_driver->set_video_mode
mode.height = win_height; || !vg->ctx_driver->set_video_mode(vg->ctx_data,
mode.fullscreen = video->fullscreen; win_width, win_height, video->fullscreen))
if (!video_context_driver_set_video_mode(&mode))
goto error; goto error;
video_driver_get_size(&temp_width, &temp_height); video_driver_get_size(&temp_width, &temp_height);
@ -191,8 +187,6 @@ static void *vg_init(const video_info_t *video,
temp_width = mode.width; temp_width = mode.width;
temp_height = mode.height; temp_height = mode.height;
mode.width = 0;
mode.height = 0;
vg->should_resize = true; vg->should_resize = true;

21
gfx/drivers/vulkan.c
View File

@ -1217,11 +1217,9 @@ static void *vulkan_init(const video_info_t *video,
win_height = full_y; win_height = full_y;
} }
mode.width = win_width; if ( !vk->ctx_driver->set_video_mode
mode.height = win_height; || !vk->ctx_driver->set_video_mode(vk->ctx_data,
mode.fullscreen = video->fullscreen; win_width, win_height, video->fullscreen))
if (!video_context_driver_set_video_mode(&mode))
{ {
RARCH_ERR("[Vulkan]: Failed to set video mode.\n"); RARCH_ERR("[Vulkan]: Failed to set video mode.\n");
goto error; goto error;
@ -1456,15 +1454,10 @@ static void vulkan_set_video_mode(void *data,
unsigned width, unsigned height, unsigned width, unsigned height,
bool fullscreen) bool fullscreen)
{ {
gfx_ctx_mode_t mode; vk_t *vk = (vk_t*)data;
if (vk->ctx_driver->set_video_mode)
(void)data; vk->ctx_driver->set_video_mode(vk->ctx_data,
width, height, fullscreen);
mode.width = width;
mode.height = height;
mode.fullscreen = fullscreen;
video_context_driver_set_video_mode(&mode);
} }
static void vulkan_set_viewport(void *data, unsigned viewport_width, static void vulkan_set_viewport(void *data, unsigned viewport_width,

19
retroarch.c
View File

@ -31465,9 +31465,7 @@ bool video_driver_set_rotation(unsigned rotation)
bool video_driver_set_video_mode(unsigned width, bool video_driver_set_video_mode(unsigned width,
unsigned height, bool fullscreen) unsigned height, bool fullscreen)
{ {
gfx_ctx_mode_t mode;
struct rarch_state *p_rarch = &rarch_st; struct rarch_state *p_rarch = &rarch_st;
if ( p_rarch->video_driver_poke && if ( p_rarch->video_driver_poke &&
p_rarch->video_driver_poke->set_video_mode) p_rarch->video_driver_poke->set_video_mode)
{ {
@ -31475,12 +31473,7 @@ bool video_driver_set_video_mode(unsigned width,
width, height, fullscreen); width, height, fullscreen);
return true; return true;
} }
return false;
mode.width = width;
mode.height = height;
mode.fullscreen = fullscreen;
return video_context_driver_set_video_mode(&mode);
} }
bool video_driver_get_video_output_size(unsigned *width, unsigned *height) bool video_driver_get_video_output_size(unsigned *width, unsigned *height)
@ -33384,16 +33377,6 @@ bool video_context_driver_get_ident(gfx_ctx_ident_t *ident)
return true; return true;
} }
bool video_context_driver_set_video_mode(gfx_ctx_mode_t *mode_info)
{
struct rarch_state *p_rarch = &rarch_st;
if (!p_rarch->current_video_context.set_video_mode)
return false;
return p_rarch->current_video_context.set_video_mode(
p_rarch->video_context_data, mode_info->width,
mode_info->height, mode_info->fullscreen);
}
bool video_context_driver_get_video_size(gfx_ctx_mode_t *mode_info) bool video_context_driver_get_video_size(gfx_ctx_mode_t *mode_info)
{ {
struct rarch_state *p_rarch = &rarch_st; struct rarch_state *p_rarch = &rarch_st;

2
retroarch.h
View File

@ -1770,8 +1770,6 @@ void video_context_driver_destroy(void);
bool video_context_driver_get_ident(gfx_ctx_ident_t *ident); bool video_context_driver_get_ident(gfx_ctx_ident_t *ident);
bool video_context_driver_set_video_mode(gfx_ctx_mode_t *mode_info);
bool video_context_driver_get_video_size(gfx_ctx_mode_t *mode_info); bool video_context_driver_get_video_size(gfx_ctx_mode_t *mode_info);
bool video_context_driver_get_refresh_rate(float *refresh_rate); bool video_context_driver_get_refresh_rate(float *refresh_rate);