mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of video_shader_driver_get_prev_textures

Browse Source
This commit is contained in:
twinaphex 2019-02-03 05:49:18 +01:00
parent 000787837e
commit 9a04c4c67b
3 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gfx/drivers/gl.c
View File

@ -3423,13 +3423,9 @@ static void *gl_init(const video_info_t *video,
}
{
unsigned minimum;
video_shader_ctx_texture_t texture_info;
video_shader_driver_get_prev_textures(&texture_info);
minimum = texture_info.id;
gl->textures = MAX(minimum + 1, gl->textures);
unsigned texture_info_id = gl->shader->get_prev_textures(gl->shader_data);
unsigned minimum = texture_info_id;
gl->textures = MAX(minimum + 1, gl->textures);
}
if (!video_shader_driver_info(&shader_info))
@ -3628,7 +3624,6 @@ static bool gl_set_shader(void *data,
{
#if defined(HAVE_GLSL) || defined(HAVE_CG)
unsigned textures;
video_shader_ctx_texture_t texture_info;
video_shader_ctx_init_t init_data;
gl_t *gl = (gl_t*)data;
@ -3690,9 +3685,10 @@ static bool gl_set_shader(void *data,
gl_update_tex_filter_frame(gl);
video_shader_driver_get_prev_textures(&texture_info);
textures = texture_info.id + 1;
{
unsigned texture_info_id = gl->shader->get_prev_textures(gl->shader_data);
textures = texture_info_id + 1;
}
if (textures > gl->textures) /* Have to reinit a bit. */
{

17
gfx/video_driver.c
View File

@ -3458,16 +3458,6 @@ static const shader_backend_t *video_shader_set_backend(
return NULL;
}
bool video_shader_driver_get_prev_textures(
video_shader_ctx_texture_t *texture)
{
if (!texture || !current_shader)
return false;
texture->id = current_shader->get_prev_textures(current_shader_data);
return true;
}
bool video_shader_driver_get_ident(video_shader_ctx_ident_t *ident)
{
if (!ident || !current_shader)
@ -3536,11 +3526,6 @@ static void video_shader_driver_scale_null(void *data,
(void)scale;
}
static unsigned video_shader_driver_num_null(void *data)
{
return 0;
}
static void video_shader_driver_reset_to_defaults(void)
{
if (!current_shader)
@ -3558,8 +3543,6 @@ static void video_shader_driver_reset_to_defaults(void)
if (!current_shader->shader_scale)
current_shader->shader_scale = video_shader_driver_scale_null;
if (!current_shader->num_shaders)
current_shader->num_shaders = video_shader_driver_num_null;
if (!current_shader->get_current_shader)
current_shader->get_current_shader= video_shader_driver_get_current_shader_null;
}

2
gfx/video_driver.h
View File

@ -1180,8 +1180,6 @@ enum gfx_ctx_api video_context_driver_get_api(void);
void video_context_driver_free(void);
bool video_shader_driver_get_prev_textures(video_shader_ctx_texture_t *texture);
bool video_shader_driver_get_ident(video_shader_ctx_ident_t *ident);
bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader);