From cd5534758b5760f4bdfad1805b58145c95e743e8 Mon Sep 17 00:00:00 2001 From: eihrul Date: Mon, 1 Apr 2013 15:58:00 +0000 Subject: [PATCH] move extension enables to the top of the shader to comply with spec git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11932 d7cf8633-e32d-0410-b094-e92efae38249 --- shader_glsl.h | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/shader_glsl.h b/shader_glsl.h index 756118d4..63540fc8 100644 --- a/shader_glsl.h +++ b/shader_glsl.h @@ -2,6 +2,25 @@ "// written by Forest 'LordHavoc' Hale\n", "// shadowmapping enhancements by Lee 'eihrul' Salzman\n", "\n", +"#ifdef USESKELETAL\n", +"# ifdef GL_ARB_uniform_buffer_object\n", +"# extension GL_ARB_uniform_buffer_object : enable\n", +"# endif\n", +"#endif\n", +"\n", +"#ifdef USESHADOWMAP2D\n", +"# ifdef GL_EXT_gpu_shader4\n", +"# extension GL_EXT_gpu_shader4 : enable\n", +"# endif\n", +"# ifdef GL_ARB_texture_gather\n", +"# extension GL_ARB_texture_gather : enable\n", +"# else\n", +"# ifdef GL_AMD_texture_texture4\n", +"# extension GL_AMD_texture_texture4 : enable\n", +"# endif\n", +"# endif\n", +"#endif\n", +"\n", "#ifdef USECELSHADING\n", "# define SHADEDIFFUSE myhalf diffuse = cast_myhalf(min(max(float(dot(surfacenormal, lightnormal)) * 2.0, 0.0), 1.0));\n", "# ifdef USEEXACTSPECULARMATH\n", @@ -68,11 +87,6 @@ "#endif\n", "\n", "#ifdef VERTEX_SHADER\n", -"#ifdef USESKELETAL\n", -"#ifdef GL_ARB_uniform_buffer_object\n", -"#extension GL_ARB_uniform_buffer_object : enable\n", -"#endif\n", -"#endif\n", "dp_attribute vec4 Attrib_Position; // vertex\n", "dp_attribute vec4 Attrib_Color; // color\n", "dp_attribute vec4 Attrib_TexCoord0; // material texcoords\n", @@ -106,19 +120,6 @@ "# define USEEYEVECTOR\n", "#endif\n", "\n", -"#ifdef USESHADOWMAP2D\n", -"# ifdef GL_EXT_gpu_shader4\n", -"# extension GL_EXT_gpu_shader4 : enable\n", -"# endif\n", -"# ifdef GL_ARB_texture_gather\n", -"# extension GL_ARB_texture_gather : enable\n", -"# else\n", -"# ifdef GL_AMD_texture_texture4\n", -"# extension GL_AMD_texture_texture4 : enable\n", -"# endif\n", -"# endif\n", -"#endif\n", -"\n", "//#ifdef __GLSL_CG_DATA_TYPES\n", "//# define myhalf half\n", "//# define myhalf2 half2\n", -- 2.39.2