From bf63ef05d937098ce3bdd584952ffe10d695459a Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Thu, 14 Nov 2013 00:16:43 +0000 Subject: [PATCH] Add GetEsslVersionString() and GetGlslVersionString(). git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24054 e7fa87d3-cd2b-0410-9028-fcbf551c1848 --- StandAlone/StandAlone.cpp | 3 +++ glslang/MachineIndependent/ShaderLang.cpp | 10 ++++++++++ glslang/Public/ShaderLang.h | 3 +++ 3 files changed, 16 insertions(+) diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp index 90b931f9..8e240c62 100644 --- a/StandAlone/StandAlone.cpp +++ b/StandAlone/StandAlone.cpp @@ -551,6 +551,9 @@ void CompileAndLinkShaders() { // keep track of what to free std::list shaders; + + //printf("%s\n", glslang::GetEsslVersionString()); + //printf("%s\n", glslang::GetGlslVersionString()); EShMessages messages = EShMsgDefault; SetMessageOptions(messages); diff --git a/glslang/MachineIndependent/ShaderLang.cpp b/glslang/MachineIndependent/ShaderLang.cpp index ee1cdd68..3e137d31 100644 --- a/glslang/MachineIndependent/ShaderLang.cpp +++ b/glslang/MachineIndependent/ShaderLang.cpp @@ -912,6 +912,16 @@ int ShGetUniformLocation(const ShHandle handle, const char* name) namespace glslang { +const char* GetEsslVersionString() +{ + return "OpenGL ES GLSL 3.00 glslang"; +} + +const char* GetGlslVersionString() +{ + return "4.20 glslang"; +} + bool InitializeProcess() { return ShInitialize() != 0; diff --git a/glslang/Public/ShaderLang.h b/glslang/Public/ShaderLang.h index 39b4c286..92026472 100644 --- a/glslang/Public/ShaderLang.h +++ b/glslang/Public/ShaderLang.h @@ -263,6 +263,9 @@ class TInfoSink; namespace glslang { +const char* GetEsslVersionString(); +const char* GetGlslVersionString(); + class TIntermediate; class TProgram; class TPoolAllocator;