apply bias to orthographic shadowmaps

[xonotic/darkplaces.git] / gl_rmain.c

diff --git a/gl_rmain.c b/gl_rmain.c
index 633ef695406299e365741bc76c791ed28ab55daf..fc314d1e88829a19d0b187c03ee4d8ad7dc46fc2 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -1058,7 +1058,7 @@ static const char *builtinshaderstring =
 "\n"
 "#if defined(USESHADOWMAPRECT) || defined(USESHADOWMAP2D)\n"
 "# ifdef USESHADOWMAPORTHO\n"
-"#  define GetShadowMapTC2D(dir) (min(dir, vec3(ShadowMap_Parameters.zw, 1.0)))\n"
+"#  define GetShadowMapTC2D(dir) (min(dir, ShadowMap_Parameters.xyz))\n"
 "# else\n"
 "#  ifdef USESHADOWMAPVSDCT\n"
 "vec3 GetShadowMapTC2D(vec3 dir)\n"
@@ -1167,7 +1167,7 @@ static const char *builtinshaderstring =
 "\n"
 "#  endif\n"
 "#  ifdef USESHADOWMAPORTHO\n"
-"      return mix(ShadowMap_Parameters.x, ShadowMap_Parameters.y, f);\n"
+"      return mix(ShadowMap_Parameters.w, 1.0, f);\n"
 "#  else\n"
 "      return f;\n"
 "#  endif\n"
@@ -1234,7 +1234,7 @@ static const char *builtinshaderstring =
 "#    endif\n"
 "#  endif\n"
 "#  ifdef USESHADOWMAPORTHO\n"
-"      return mix(ShadowMap_Parameters.x, ShadowMap_Parameters.y, f);\n"
+"      return mix(ShadowMap_Parameters.w, 1.0, f);\n"
 "#  else\n"
 "      return f;\n"
 "#  endif\n"
@@ -2216,7 +2216,7 @@ const char *builtincgshaderstring =
 "#if defined(MODE_LIGHTSOURCE) || defined(MODE_DEFERREDLIGHTSOURCE) || defined(USESHADOWMAPORTHO)\n"
 "#if defined(USESHADOWMAPRECT) || defined(USESHADOWMAP2D)\n"
 "# ifdef USESHADOWMAPORTHO\n"
-"#  define GetShadowMapTC2D(dir, ShadowMap_Parameters) (min(dir, float3(ShadowMap_Parameters.zw, 1.0)))\n"
+"#  define GetShadowMapTC2D(dir, ShadowMap_Parameters) (min(dir, ShadowMap_Parameters.xyz))\n"
 "# else\n"
 "#  ifdef USESHADOWMAPVSDCT\n"
 "float3 GetShadowMapTC2D(float3 dir, float4 ShadowMap_Parameters, samplerCUBE Texture_CubeProjection)\n"
@@ -2333,7 +2333,7 @@ const char *builtincgshaderstring =
 "\n"
 "#  endif\n"
 "#  ifdef USESHADOWMAPORTHO\n"
-"      return lerp(ShadowMap_Parameters.x, ShadowMap_Parameters.y, f);\n"
+"      return lerp(ShadowMap_Parameters.w, 1.0, f);\n"
 "#  else\n"
 "      return f;\n"
 "#  endif\n"
@@ -2404,7 +2404,7 @@ const char *builtincgshaderstring =
 "#    endif\n"
 "#  endif\n"
 "#  ifdef USESHADOWMAPORTHO\n"
-"      return lerp(ShadowMap_Parameters.x, ShadowMap_Parameters.y, f);\n"
+"      return lerp(ShadowMap_Parameters.w, 1.0, f);\n"
 "#  else\n"
 "      return f;\n"
 "#  endif\n"