This commit is contained in:
twinaphex 2017-05-18 14:22:50 +02:00
parent 2f72506959
commit 374f8e8a19
2 changed files with 10 additions and 10 deletions

View File

@ -61,12 +61,6 @@ static void shader_null_set_uniform_parameter(
{ {
} }
static unsigned shader_null_num(void *data)
{
return 0;
}
static unsigned shader_null_get_prev_textures(void *data) static unsigned shader_null_get_prev_textures(void *data)
{ {
return 0; return 0;
@ -99,7 +93,7 @@ const shader_backend_t shader_null_backend = {
shader_null_set_uniform_parameter, shader_null_set_uniform_parameter,
shader_null_compile_program, shader_null_compile_program,
NULL, NULL,
shader_null_num, NULL,
NULL, NULL,
NULL, NULL,
NULL, NULL,

View File

@ -210,6 +210,11 @@ static bool video_shader_driver_filter_type_null(void *data, unsigned idx, bool
return false; return false;
} }
static unsigned video_shader_driver_num_null(void *data)
{
return 0;
}
static void video_shader_driver_reset_to_defaults(void) static void video_shader_driver_reset_to_defaults(void)
{ {
if (!current_shader->wrap_type) if (!current_shader->wrap_type)
@ -228,6 +233,8 @@ static void video_shader_driver_reset_to_defaults(void)
current_shader->mipmap_input = video_shader_driver_mipmap_input_null; current_shader->mipmap_input = video_shader_driver_mipmap_input_null;
if (!current_shader->filter_type) if (!current_shader->filter_type)
current_shader->filter_type = video_shader_driver_filter_type_null; current_shader->filter_type = video_shader_driver_filter_type_null;
if (!current_shader->num_shaders)
current_shader->num_shaders = video_shader_driver_num_null;
} }
/* Finds first suitable shader context driver. */ /* Finds first suitable shader context driver. */
@ -293,9 +300,8 @@ bool video_shader_driver_info(video_shader_ctx_info_t *shader_info)
if (!shader_info) if (!shader_info)
return false; return false;
shader_info->num = 0; shader_info->num = current_shader->num_shaders(shader_data);
if (current_shader->num_shaders)
shader_info->num = current_shader->num_shaders(shader_data);
return true; return true;
} }