Added GLSL460 to output shader versions.

LukasBanana · Aug 20, 2017 · a798f5d · a798f5d
1 parent 8a29fcf
commit a798f5d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/inc/Xsc/Targets.h b/inc/Xsc/Targets.h
@@ -63,6 +63,7 @@ enum class OutputShaderVersion
     GLSL430 = 430,                  //!< GLSL 4.30 (OpenGL 4.3).
     GLSL440 = 440,                  //!< GLSL 4.40 (OpenGL 4.4).
     GLSL450 = 450,                  //!< GLSL 4.50 (OpenGL 4.5).
+    GLSL460 = 460,                  //!< GLSL 4.60 (OpenGL 4.6).
     GLSL    = 0x0000ffff,           //!< Auto-detect minimal required GLSL version (for OpenGL 2+).
 
     ESSL100 = (0x00010000 + 100),   //!< ESSL 1.00 (OpenGL ES 2.0). \note Currently not supported!

diff --git a/src/Compiler/Targets.cpp b/src/Compiler/Targets.cpp
@@ -62,6 +62,7 @@ XSC_EXPORT std::string ToString(const OutputShaderVersion shaderVersion)
         case OutputShaderVersion::GLSL430:  return "GLSL 4.30";
         case OutputShaderVersion::GLSL440:  return "GLSL 4.40";
         case OutputShaderVersion::GLSL450:  return "GLSL 4.50";
+        case OutputShaderVersion::GLSL460:  return "GLSL 4.60";
         case OutputShaderVersion::GLSL:     return "GLSL";
 
         case OutputShaderVersion::ESSL100:  return "ESSL 1.00";
@@ -97,7 +98,7 @@ XSC_EXPORT bool IsLanguageGLSL(const InputShaderVersion shaderVersion)
 
 XSC_EXPORT bool IsLanguageGLSL(const OutputShaderVersion shaderVersion)
 {
-    return ((shaderVersion >= OutputShaderVersion::GLSL110 && shaderVersion <= OutputShaderVersion::GLSL450) || shaderVersion == OutputShaderVersion::GLSL);
+    return ((shaderVersion >= OutputShaderVersion::GLSL110 && shaderVersion <= OutputShaderVersion::GLSL460) || shaderVersion == OutputShaderVersion::GLSL);
 }
 
 XSC_EXPORT bool IsLanguageESSL(const OutputShaderVersion shaderVersion)

diff --git a/src/Shell/Command.cpp b/src/Shell/Command.cpp
@@ -206,8 +206,8 @@ HelpDescriptor VersionOutCommand::Help() const
         "-Vout, --version-out VERSION",
         R_CmdHelpVersionOut,
         (
-            "GLSL[110, 120, 130, 140, 150, 330, 400, 410, 420, 430, 440, 450],\n"   \
-            "ESSL[100, 300, 310, 320],\n"                                           \
+            "GLSL[110, 120, 130, 140, 150, 330, 400, 410, 420, 430, 440, 450, 460],\n"  \
+            "ESSL[100, 300, 310, 320],\n"                                               \
             "VKSL[450]"
         ),
         HelpCategory::Main
@@ -233,6 +233,7 @@ void VersionOutCommand::Run(CommandLine& cmdLine, ShellState& state)
             { "GLSL430", OutputShaderVersion::GLSL430 },
             { "GLSL440", OutputShaderVersion::GLSL440 },
             { "GLSL450", OutputShaderVersion::GLSL450 },
+            { "GLSL460", OutputShaderVersion::GLSL460 },
             { "GLSL",    OutputShaderVersion::GLSL    },
 
             { "ESSL100", OutputShaderVersion::ESSL100 },