fix a couple compile issues affecting Maemo

[xonotic/darkplaces.git] / shader_glsl.h

diff --git a/shader_glsl.h b/shader_glsl.h
index 9f9387b62628d721aa6d8262f8694299ea5ba1ca..d4ce8a1535b91109e69b331736d63394f263d6e4 100644 (file)
--- a/shader_glsl.h
+++ b/shader_glsl.h
@@ -131,6 +131,13 @@
 "#endif\n"
 "}\n"
 "#endif\n"
+"\n"
+"#ifdef FRAGMENT_SHADER\n"
+"void main(void)\n"
+"{\n"
+"      dp_FragColor = vec4(1.0,1.0,1.0,1.0);\n"
+"}\n"
+"#endif\n"
 "#else // !MODE_DEPTH_ORSHADOW\n"
 "\n"
 "\n"
@@ -1270,15 +1277,15 @@
 "      myhalf3 lightnormal = myhalf3(dp_texture2D(Texture_Deluxemap, TexCoordSurfaceLightmap.zw)) * 2.0 + myhalf3(-1.0, -1.0, -1.0);\n"
 "      myhalf3 lightcolor = myhalf3(dp_texture2D(Texture_Lightmap, TexCoordSurfaceLightmap.zw));\n"
 "#endif\n"
-"#if defined(MODE_LIGHTDIRECTIONMAP_FORCED_LIGHTMAP) || defined(MODE_LIGHTDIRECTIONMAP_FORCED_VERTEXCOLOR)\n"\r
-"      #define SHADING\n"\r
-"      // forced deluxemap on lightmapped/vertexlit surfaces\n"\r
-"      myhalf3 lightnormal = myhalf3(0.0, 0.0, 1.0);\n"\r
-"   #ifdef USELIGHTMAP\n"\r
-"              myhalf3 lightcolor = myhalf3(dp_texture2D(Texture_Lightmap, TexCoordSurfaceLightmap.zw));\n"\r
-"   #else\n"\r
-"              myhalf3 lightcolor = myhalf3(VertexColor.rgb);\n"\r
-"   #endif\n"\r
+"#if defined(MODE_LIGHTDIRECTIONMAP_FORCED_LIGHTMAP) || defined(MODE_LIGHTDIRECTIONMAP_FORCED_VERTEXCOLOR)\n"
+"      #define SHADING\n"
+"      // forced deluxemap on lightmapped/vertexlit surfaces\n"
+"      myhalf3 lightnormal = myhalf3(0.0, 0.0, 1.0);\n"
+"   #ifdef USELIGHTMAP\n"
+"              myhalf3 lightcolor = myhalf3(dp_texture2D(Texture_Lightmap, TexCoordSurfaceLightmap.zw));\n"
+"   #else\n"
+"              myhalf3 lightcolor = myhalf3(VertexColor.rgb);\n"
+"   #endif\n"
 "#endif\n"
 "#ifdef MODE_FAKELIGHT\n"
 "      #define SHADING\n"