From af2a35bfefa2c49f3ca31749f1da9f3782a10500 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Thu, 29 Jul 2021 14:23:17 +0800 Subject: [PATCH] use ShaderLanguageType instead of ShaderType because We can redefine ShaderType. --- glsl2spv.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glsl2spv.cpp b/glsl2spv.cpp index 79442ad..965ac36 100644 --- a/glsl2spv.cpp +++ b/glsl2spv.cpp @@ -213,7 +213,7 @@ extern "C" glslang::FinalizeProcess(); } - enum class ShaderType + enum class ShaderLanguageType { GLSL=0, HLSL, @@ -223,7 +223,7 @@ extern "C" struct CompileInfo { - ShaderType shader_type = ShaderType::GLSL; + ShaderLanguageType shader_type = ShaderLanguageType::GLSL; const char *entrypoint; uint32_t includes_count; const char **includes; @@ -494,7 +494,7 @@ extern "C" if (compile_info != nullptr) { - if (compile_info->shader_type == ShaderType::HLSL) + if (compile_info->shader_type == ShaderLanguageType::HLSL) { messages = (EShMessages)(EShMsgReadHlsl | EShMsgSpvRules | EShMsgVulkanRules);