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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-05-18 14:31:40 +02:00
parent cb529822c6
commit 4e7b376e18
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/drivers_shader/shader_null.c
View File

@ -66,12 +66,6 @@ static unsigned shader_null_get_prev_textures(void *data)
return 0;
}
static bool shader_null_get_feedback_pass(void *data, unsigned *idx)
{
(void)idx;
return false;
}
static bool shader_null_compile_program(
void *data,
unsigned idx,
@ -96,7 +90,7 @@ const shader_backend_t shader_null_backend = {
NULL,
NULL,
shader_null_get_prev_textures,
shader_null_get_feedback_pass,
NULL,
NULL,
NULL,

28
gfx/video_shader_driver.c
View File

@ -217,6 +217,12 @@ static unsigned video_shader_driver_num_null(void *data)
return 0;
}
static bool video_shader_driver_get_feedback_pass_null(void *data, unsigned *idx)
{
(void)idx;
return false;
}
static void video_shader_driver_reset_to_defaults(void)
{
if (!current_shader->wrap_type)
@ -239,6 +245,8 @@ static void video_shader_driver_reset_to_defaults(void)
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;
if (!current_shader->get_feedback_pass)
current_shader->get_feedback_pass = video_shader_driver_get_feedback_pass_null;
}
/* Finds first suitable shader context driver. */
@ -275,11 +283,7 @@ bool video_shader_driver_init(video_shader_ctx_init_t *init)
bool video_shader_driver_get_feedback_pass(unsigned *data)
{
if ( current_shader
&& current_shader->get_feedback_pass
&& current_shader->get_feedback_pass(shader_data, data))
return true;
return false;
return current_shader->get_feedback_pass(shader_data, data);
}
bool video_shader_driver_mipmap_input(unsigned *index)
@ -287,7 +291,6 @@ bool video_shader_driver_mipmap_input(unsigned *index)
return current_shader->mipmap_input(shader_data, *index);
}
bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler)
{
if (!scaler || !scaler->scale)
@ -311,19 +314,14 @@ bool video_shader_driver_info(video_shader_ctx_info_t *shader_info)
bool video_shader_driver_filter_type(video_shader_ctx_filter_t *filter)
{
if ( filter
&& current_shader->filter_type(shader_data,
filter->index, filter->smooth))
return true;
return false;
return (filter) ? current_shader->filter_type(shader_data,
filter->index, filter->smooth) : false;
}
bool video_shader_driver_compile_program(struct shader_program_info *program_info)
{
if (program_info)
return current_shader->compile_program(program_info->data,
program_info->idx, NULL, program_info);
return false;
return (program_info) ? current_shader->compile_program(program_info->data,
program_info->idx, NULL, program_info) : false;
}
bool video_shader_driver_wrap_type(video_shader_ctx_wrap_t *wrap)