From f9d9070de86077a04aa56b92da8a2c9f3bc7b09a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 20 Jun 2016 22:04:59 +0200 Subject: [PATCH] command.c - cleanups --- command.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/command.c b/command.c index 762d6a579d..416db7d15f 100644 --- a/command.c +++ b/command.c @@ -149,32 +149,23 @@ struct cmd_action_map }; #ifdef HAVE_COMMAND -#define COMMAND_EXT_GLSL 0x7c976537U -#define COMMAND_EXT_GLSLP 0x0f840c87U -#define COMMAND_EXT_CG 0x0059776fU -#define COMMAND_EXT_CGP 0x0b8865bfU -#define COMMAND_EXT_SLANG 0x105ce63aU -#define COMMAND_EXT_SLANGP 0x1bf9adeaU - static bool command_set_shader(const char *arg) { char msg[256]; enum rarch_shader_type type = RARCH_SHADER_NONE; - const char *ext = path_get_extension(arg); - uint32_t ext_hash = msg_hash_calculate(ext); - switch (ext_hash) + switch (msg_hash_to_file_type(msg_hash_calculate(path_get_extension(arg)))) { - case COMMAND_EXT_GLSL: - case COMMAND_EXT_GLSLP: + case FILE_TYPE_SHADER_GLSL: + case FILE_TYPE_SHADER_PRESET_GLSLP: type = RARCH_SHADER_GLSL; break; - case COMMAND_EXT_CG: - case COMMAND_EXT_CGP: + case FILE_TYPE_SHADER_CG: + case FILE_TYPE_SHADER_PRESET_CGP: type = RARCH_SHADER_CG; break; - case COMMAND_EXT_SLANG: - case COMMAND_EXT_SLANGP: + case FILE_TYPE_SHADER_SLANG: + case FILE_TYPE_SHADER_PRESET_SLANGP: type = RARCH_SHADER_SLANG; break; default: