From: havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 <>
Date: Fri, 17 Sep 2010 11:28:24 +0000 (+0000)
Subject: UNMERGE
X-Git-Tag: xonotic-v0.1.0preview~215
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aa4f4835f23ebc7af5e5dc47d696209414c6ec47;p=xonotic%2Fdarkplaces.git

UNMERGE
in D3D9 mode do not use the VSDCT cubemap because the ShadowMap_Parameters are completely incompatible in the D3D9 renderer

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10470 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=f9e8d27908695f31f979cc07f96e5d8e312e4af4
---

diff --git a/r_shadow.c b/r_shadow.c
index 1fc6410b..08bec055 100644
--- a/r_shadow.c
+++ b/r_shadow.c
@@ -368,7 +368,7 @@ skinframe_t *r_editlights_sprselection;
 void R_Shadow_SetShadowMode(void)
 {
 	r_shadow_shadowmapmaxsize = bound(1, r_shadow_shadowmapping_maxsize.integer, (int)vid.maxtexturesize_2d / 4);
-	r_shadow_shadowmapvsdct = r_shadow_shadowmapping_vsdct.integer != 0 && vid.renderpath == RENDERPATH_GL20;
+	r_shadow_shadowmapvsdct = r_shadow_shadowmapping_vsdct.integer != 0;
 	r_shadow_shadowmapfilterquality = r_shadow_shadowmapping_filterquality.integer;
 	r_shadow_shadowmapdepthbits = r_shadow_shadowmapping_depthbits.integer;
 	r_shadow_shadowmapborder = bound(0, r_shadow_shadowmapping_bordersize.integer, 16);
@@ -3960,7 +3960,7 @@ void R_Shadow_PrepareLights(void)
 
 	if (r_shadow_shadowmapmaxsize != bound(1, r_shadow_shadowmapping_maxsize.integer, (int)vid.maxtexturesize_2d / 4) ||
 		(r_shadow_shadowmode != R_SHADOW_SHADOWMODE_STENCIL) != (r_shadow_shadowmapping.integer || r_shadow_deferred.integer) ||
-		r_shadow_shadowmapvsdct != (r_shadow_shadowmapping_vsdct.integer != 0 && vid.renderpath == RENDERPATH_GL20) || 
+		r_shadow_shadowmapvsdct != (r_shadow_shadowmapping_vsdct.integer != 0) || 
 		r_shadow_shadowmapfilterquality != r_shadow_shadowmapping_filterquality.integer || 
 		r_shadow_shadowmapdepthbits != r_shadow_shadowmapping_depthbits.integer || 
 		r_shadow_shadowmapborder != bound(0, r_shadow_shadowmapping_bordersize.integer, 16))