From: havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 <>
Date: Wed, 22 Sep 2010 16:21:11 +0000 (+0000)
Subject: UNMERGE
X-Git-Tag: xonotic-v0.1.0preview~223
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0070b0b5b67ba37f3b60c53b7363cb3c2794218f;p=xonotic%2Fdarkplaces.git

UNMERGE
fix a compile error and some warnings

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

diff --git a/r_shadow.c b/r_shadow.c
index 8e695852..454ec441 100644
--- a/r_shadow.c
+++ b/r_shadow.c
@@ -2052,7 +2052,6 @@ void R_Shadow_RenderMode_ShadowMap(int side, int clear, int size)
 	r_viewport_t viewport;
 	int flipped;
 	GLuint fbo = 0;
-	float clearcolor[4];
 	nearclip = r_shadow_shadowmapping_nearclip.value / rsurface.rtlight->radius;
 	farclip = 1.0f;
 	bias = r_shadow_shadowmapping_bias.value * nearclip * (1024.0f / size);// * rsurface.rtlight->radius;
@@ -2116,6 +2115,7 @@ init_done:
 		GL_Scissor(viewport.x, viewport.y, viewport.width, viewport.height);
 		break;
 	case RENDERPATH_D3D9:
+		float clearcolor[4];
 		Vector4Set(clearcolor, 1,1,1,1);
 		// completely different meaning than in OpenGL path
 		r_shadow_shadowmap_parameters[1] = 0;
@@ -4369,14 +4369,9 @@ void R_DrawModelShadowMaps(void)
 
 	switch (vid.renderpath)
 	{
-	case RENDERPATH_GL11:
-	case RENDERPATH_GL13:
-	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
-		break;
-	case RENDERPATH_D3D9:
-	case RENDERPATH_D3D10:
-	case RENDERPATH_D3D11:
+		case RENDERPATH_D3D9:
+		case RENDERPATH_D3D10:
+		case RENDERPATH_D3D11:
 #ifdef OPENGL_ORIENTATION
 		r_shadow_shadowmapmatrix.m[0][0]	*= -1.0f;
 		r_shadow_shadowmapmatrix.m[0][1]	*= -1.0f;