From 6d0286efbdb36147d9148fe795601f32303a9fd9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 22 Jan 2020 14:30:55 +0100 Subject: [PATCH] Turn video_shader_parse_type into macro --- gfx/video_shader_parse.c | 14 -------------- gfx/video_shader_parse.h | 9 +++++---- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c index 8fd9961db7..c25a2be364 100644 --- a/gfx/video_shader_parse.c +++ b/gfx/video_shader_parse.c @@ -1259,20 +1259,6 @@ enum rarch_shader_type video_shader_get_type_from_ext(const char *ext, return RARCH_SHADER_NONE; } -/** - * video_shader_parse_type: - * @path : Shader path. - * - * Parses type of shader. - * - * Returns: value of shader type if it could be determined, - * otherwise RARCH_SHADER_NONE. - **/ -enum rarch_shader_type video_shader_parse_type(const char *path) -{ - return video_shader_get_type_from_ext(path_get_extension(path), NULL); -} - bool video_shader_check_for_changes(void) { if (!file_change_data) diff --git a/gfx/video_shader_parse.h b/gfx/video_shader_parse.h index 7ff5bdf391..a7a492df79 100644 --- a/gfx/video_shader_parse.h +++ b/gfx/video_shader_parse.h @@ -21,6 +21,7 @@ #include #include #include +#include RETRO_BEGIN_DECLS @@ -246,6 +247,9 @@ bool video_shader_resolve_current_parameters(config_file_t *conf, bool video_shader_resolve_parameters(config_file_t *conf, struct video_shader *shader); +enum rarch_shader_type video_shader_get_type_from_ext(const char *ext, + bool *is_preset); + /** * video_shader_parse_type: * @path : Shader path. @@ -255,10 +259,7 @@ bool video_shader_resolve_parameters(config_file_t *conf, * Returns: value of shader type if it could be determined, * otherwise RARCH_SHADER_NONE. **/ -enum rarch_shader_type video_shader_parse_type(const char *path); - -enum rarch_shader_type video_shader_get_type_from_ext(const char *ext, - bool *is_preset); +#define video_shader_parse_type(path) video_shader_get_type_from_ext(path_get_extension((path)), NULL) bool video_shader_is_supported(enum rarch_shader_type type);