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

Cleanups

This commit is contained in:
twinaphex 2019-02-03 06:28:27 +01:00
parent 0db583c245
commit add4ac00eb
3 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/drivers/gl.c
View File

@ -2416,11 +2416,12 @@ static void gl_show_mouse(void *data, bool state)
static struct video_shader *gl_get_current_shader(void *data) static struct video_shader *gl_get_current_shader(void *data)
{ {
video_shader_ctx_t shader_info = {0}; gl_t *gl = (gl_t*)data;
video_shader_driver_direct_get_current_shader(&shader_info); if (!gl)
return NULL;
return shader_info.data; return gl->shader->get_current_shader(gl->shader_data);
} }
#if defined(HAVE_MENU) #if defined(HAVE_MENU)

19
gfx/video_driver.c
View File

@ -3478,17 +3478,6 @@ bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader)
return true; return true;
} }
bool video_shader_driver_direct_get_current_shader(
video_shader_ctx_t *shader)
{
if (!current_shader)
return false;
shader->data = current_shader->get_current_shader(current_shader_data);
return true;
}
bool video_shader_driver_deinit(void) bool video_shader_driver_deinit(void)
{ {
if (!current_shader) if (!current_shader)
@ -3513,12 +3502,6 @@ static bool video_driver_cb_set_mvp(void *data,
return true; return true;
} }
static struct video_shader *
video_shader_driver_get_current_shader_null(void *data)
{
return NULL;
}
static void video_shader_driver_scale_null(void *data, static void video_shader_driver_scale_null(void *data,
unsigned idx, struct gfx_fbo_scale *scale) unsigned idx, struct gfx_fbo_scale *scale)
{ {
@ -3543,8 +3526,6 @@ static void video_shader_driver_reset_to_defaults(void)
if (!current_shader->shader_scale) if (!current_shader->shader_scale)
current_shader->shader_scale = video_shader_driver_scale_null; current_shader->shader_scale = video_shader_driver_scale_null;
if (!current_shader->get_current_shader)
current_shader->get_current_shader= video_shader_driver_get_current_shader_null;
} }
/* Finds first suitable shader context driver. */ /* Finds first suitable shader context driver. */

2
gfx/video_driver.h
View File

@ -1184,8 +1184,6 @@ bool video_shader_driver_get_ident(video_shader_ctx_ident_t *ident);
bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader); bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader);
bool video_shader_driver_direct_get_current_shader(video_shader_ctx_t *shader);
bool video_shader_driver_deinit(void); bool video_shader_driver_deinit(void);
bool video_shader_driver_init_first(void); bool video_shader_driver_init_first(void);