UNMERGE

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
::stable-branch::unmerge=5f3f4500441e25bb570136717e29e79327685778

diff --git a/gl_rmain.c b/gl_rmain.c
index 5ca0e029658fbf92e2fc255d037c6a31777d2963..43365e3c6e730c36e87f70845bcac99408e0281f 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -573,6 +573,55 @@ 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"