OpenGL: Rely on predefined macro __VERSION__ in GLSL language specification, rather than rolling our own. This predefined macro has been a language feature in all GLSL versions we support. See Section 3.3 Preprocessor.

Author: Echelon9

code/globalincs/def_files.cpp

@@ -1536,7 +1536,7 @@ char *Default_main_fragment_shader =
 "varying vec4 position;\n"
 "varying vec3 lNormal;\n"
 "\n"
-"#if GLSL_VERSION == 120\n"
+"#if __VERSION__ == 120\n"
 "  #define MAX_LIGHTS 2\n"
 "#else\n"
 "  #define MAX_LIGHTS 8\n"
@@ -1727,7 +1727,7 @@ char *Default_main_fragment_shader =
 "   float dist;\n"
 "   #pragma optionNV unroll all\n"
 "   for (int i = 0; i < MAX_LIGHTS; ++i) {\n"
-" #if GLSL_VERSION > 120\n"
+" #if __VERSION__ > 120\n"
 "      if (i > n_lights)\n"
 "         break;\n"
 " #endif\n"
@@ -1737,15 +1737,15 @@ char *Default_main_fragment_shader =
 "      lightDir = normalize(gl_LightSource[i].position.xyz);\n"
 "      float attenuation = 1.0;\n"
 " #ifndef FLAG_DEFERRED\n"
-"  #if GLSL_VERSION > 120\n"
+"  #if __VERSION__ > 120\n"
 "      if (gl_LightSource[i].position.w == 1.0) {\n"
 "  #else\n"
 "      if (gl_LightSource[i].position.w == 1.0 && i != 0) {\n"
 "  #endif\n"
 "          // Positional light source\n"
 "          dist = distance(gl_LightSource[i].position.xyz, position.xyz);\n"
 "          lightDir = (gl_LightSource[i].position.xyz - position.xyz);\n"
-"  #if GLSL_VERSION > 120\n"
+"  #if __VERSION__ > 120\n"
 "          if (gl_LightSource[i].spotCutoff < 91.0) {  // Tube light\n"
 "              float beamlength = length(gl_LightSource[i].spotDirection);\n"
 "              vec3 beamDir = normalize(gl_LightSource[i].spotDirection);\n"
@@ -1904,11 +1904,11 @@ char* Default_fxaa_fragment_shader =
 "#extension GL_EXT_gpu_shader4 : enable\n"
 "#define FXAA_EARLY_EXIT 1\n"
 "#define FXAA_DISCARD 1\n"
-"#if GLSL_VERSION == 120\n"
+"#if __VERSION__ == 120\n"
 "	#define FXAA_GLSL_120 1\n"
 "	#define FXAA_GLSL_130 0\n"
 "#endif\n"
-"#if GLSL_VERSION > 120\n"
+"#if _VERSION__ > 120\n"
 "	#define FXAA_GLSL_120 0\n"
 "	#define FXAA_GLSL_130 1\n"
 "#endif\n"

code/graphics/gropenglshader.cpp

@@ -309,16 +309,6 @@ static char *opengl_load_shader(shader_type type_id, char *filename, int flags)
 	sprintf(version_string, "#version %d \n", GLSL_version);
 	sflags += version_string;
 
-	if (GLSL_version >= 330) {
-		sflags += "#define GLSL_VERSION 330\n";
-	}
-	else if (GLSL_version == 130) {
-		sflags += "#define GLSL_VERSION 130\n";
-	}
-	else {
-		sflags += "#define GLSL_VERSION 120\n";
-	}
-
 #ifdef __APPLE__
 	sflags += "#define APPLE\n";
 #endif