From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 5 Jul 2010 08:30:22 +0000 (+0000)
Subject: remove the #define list at the start of the embedded default.glsl, it
X-Git-Tag: xonotic-v0.1.0preview~230^2~204
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5f3f4500441e25bb570136717e29e79327685778;p=xonotic%2Fdarkplaces.git

remove the #define list at the start of the embedded default.glsl, it
was unintended (this list is prepended by r_glsl_dumpshader)


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10274 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_rmain.c b/gl_rmain.c
index 71662b10..d50e9c50 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -573,55 +573,6 @@ static void R_BuildFogHeightTexture(void)
 //=======================================================================================================================================================
 
 static const char *builtinshaderstring =
-"/* The engine may define the following macros:\n"
-"#define VERTEX_SHADER\n"
-"#define GEOMETRY_SHADER\n"
-"#define FRAGMENT_SHADER\n"
-"#define MODE_GENERIC\n"
-"#define MODE_POSTPROCESS\n"
-"#define MODE_DEPTH_OR_SHADOW\n"
-"#define MODE_FLATCOLOR\n"
-"#define MODE_VERTEXCOLOR\n"
-"#define MODE_LIGHTMAP\n"
-"#define MODE_LIGHTDIRECTIONMAP_MODELSPACE\n"
-"#define MODE_LIGHTDIRECTIONMAP_TANGENTSPACE\n"
-"#define MODE_LIGHTDIRECTION\n"
-"#define MODE_LIGHTSOURCE\n"
-"#define MODE_REFRACTION\n"
-"#define MODE_WATER\n"
-"#define MODE_SHOWDEPTH\n"
-"#define MODE_DEFERREDGEOMETRY\n"
-"#define MODE_DEFERREDLIGHTSOURCE\n"
-"#define USEDIFFUSE\n"
-"#define USEVERTEXTEXTUREBLEND\n"
-"#define USEVIEWTINT\n"
-"#define USECOLORMAPPING\n"
-"#define USESATURATION\n"
-"#define USEFOGINSIDE\n"
-"#define USEFOGOUTSIDE\n"
-"#define USEFOGHEIGHTTEXTURE\n"
-"#define USEGAMMARAMPS\n"
-"#define USECUBEFILTER\n"
-"#define USEGLOW\n"
-"#define USEBLOOM\n"
-"#define USESPECULAR\n"
-"#define USEPOSTPROCESSING\n"
-"#define USEEXACTSPECULARMATH\n"
-"#define USEREFLECTION\n"
-"#define USEOFFSETMAPPING\n"
-"#define USEOFFSETMAPPING_RELIEFMAPPING\n"
-"#define USESHADOWMAPRECT\n"
-"#define USESHADOWMAPCUBE\n"
-"#define USESHADOWMAP2D\n"
-"#define USESHADOWMAPPCF 1\n"
-"#define USESHADOWMAPPCF 2\n"
-"#define USESHADOWSAMPLER\n"
-"#define USESHADOWMAPVSDCT\n"
-"#define USESHADOWMAPORTHO\n"
-"#define USEDEFERREDLIGHTMAP\n"
-"#define USEALPHAKILL\n"
-"#define USEREFLECTCUBE\n"
-"*/\n"
 "// ambient+diffuse+specular+normalmap+attenuation+cubemap+fog shader\n"
 "// written by Forest 'LordHavoc' Hale\n"
 "// shadowmapping enhancements by Lee 'eihrul' Salzman\n"