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

Revert "Cleanups"

Browse Source 
This reverts commit a01a2375a18bdabba2ead7de693e94cddb2622db.
This commit is contained in:
twinaphex 2020-08-02 23:43:56 +02:00
parent a77c559505
commit da5806a810
6 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/drivers/gl.c
View File

@ -3213,8 +3213,6 @@ static void gl2_free(void *data)
gl2_renderchain_deinit_hw_render(gl, (gl2_renderchain_data_t*)gl->renderchain_data);
gl2_deinit_chain(gl);
if (gl->ctx_driver && gl->ctx_driver->destroy)
gl->ctx_driver->destroy(gl->ctx_data);
video_context_driver_free();
gl2_destroy_resources(gl);

2
gfx/drivers/gl1.c
View File

@ -1032,8 +1032,6 @@ static void gl1_gfx_free(void *data)
gl1->extensions = NULL;
font_driver_free_osd();
if (gl1->ctx_driver && gl1->ctx_driver->destroy)
gl1->ctx_driver->destroy(gl1->ctx_data);
video_context_driver_free();
free(gl1);
}

2
gfx/drivers/gl_core.c
View File

@ -1545,8 +1545,6 @@ static void gl_core_free(void *data)
gl_core_context_bind_hw_render(gl, false);
font_driver_free_osd();
gl_core_destroy_resources(gl);
if (gl->ctx_driver && gl->ctx_driver->destroy)
gl->ctx_driver->destroy(gl->ctx_data);
video_context_driver_free();
}

2
gfx/drivers/vg.c
View File

@ -309,8 +309,6 @@ static void vg_free(void *data)
vgDestroyPaint(vg->mPaintBg);
}
if (vg->ctx_driver && vg->ctx_driver->destroy)
vg->ctx_driver->destroy(vg->ctx_data);
video_context_driver_free();
free(vg);

2
gfx/drivers/vulkan.c
View File

@ -972,8 +972,6 @@ static void vulkan_free(void *data)
if (vk->filter_chain)
vulkan_filter_chain_free((vulkan_filter_chain_t*)vk->filter_chain);
if (vk->ctx_driver && vk->ctx_driver->destroy)
vk->ctx_driver->destroy(vk->ctx_data);
video_context_driver_free();
}

16
retroarch.c
View File

@ -33486,6 +33486,8 @@ const gfx_ctx_driver_t *video_context_driver_init_first(void *data,
void video_context_driver_free(void)
{
struct rarch_state *p_rarch = &rarch_st;
if (p_rarch->current_video_context.destroy)
p_rarch->current_video_context.destroy(p_rarch->video_context_data);
video_context_driver_destroy();
p_rarch->video_context_data = NULL;
}
@ -33539,14 +33541,12 @@ bool video_context_driver_input_driver(gfx_ctx_input_t *inp)
settings_t *settings = p_rarch->configuration_settings;
const char *joypad_name = settings->arrays.input_joypad_driver;
if (p_rarch && p_rarch->current_video_context.input_driver)
{
p_rarch->current_video_context.input_driver(
p_rarch->video_context_data, joypad_name,
inp->input, inp->input_data);
return true;
}
return false;
if (!p_rarch->current_video_context.input_driver)
return false;
p_rarch->current_video_context.input_driver(
p_rarch->video_context_data, joypad_name,
inp->input, inp->input_data);
return true;
}
bool video_context_driver_get_ident(gfx_ctx_ident_t *ident)