From: havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 <>
Date: Wed, 14 Jul 2010 10:13:01 +0000 (+0000)
Subject: UNMERGE
X-Git-Tag: xonotic-v0.1.0preview~186
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3ec8e531284f090720433e6c35cc6ef09a6dacd8;p=xonotic%2Fdarkplaces.git

UNMERGE
fix more mingw warnings

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

diff --git a/gl_backend.c b/gl_backend.c
index 58f66850..65ca9358 100644
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -1089,12 +1089,6 @@ static void GL_Backend_ResetState(void)
 		}
 #endif
 		break;
-	case RENDERPATH_D3D10:
-		Con_DPrintf("FIXME D3D10 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
-		break;
-	case RENDERPATH_D3D11:
-		Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
-		break;
 	case RENDERPATH_GL20:
 	case RENDERPATH_CGGL:
 		CHECKGLERROR
@@ -3373,10 +3367,6 @@ void R_Mesh_PrepareVertices_Position_Arrays(int numvertices, const float *vertex
 		if (vid.texunits >= 3)
 			R_Mesh_TexCoordPointer(2, 2, GL_FLOAT, sizeof(float[2]), NULL, NULL, 0);
 		return;
-	case RENDERPATH_D3D9:
-	case RENDERPATH_D3D10:
-	case RENDERPATH_D3D11:
-		break;
 	}
 
 	// no quick path for this case, convert to vertex structs
@@ -3445,10 +3435,6 @@ void R_Mesh_PrepareVertices_Position(int numvertices, const r_vertexposition_t *
 		R_Mesh_ColorPointer(4, GL_FLOAT, sizeof(float[4]), NULL, NULL, 0);
 		R_Mesh_TexCoordPointer(0, 2, GL_FLOAT, sizeof(float[2]), NULL, NULL, 0);
 		break;
-	case RENDERPATH_D3D9:
-	case RENDERPATH_D3D10:
-	case RENDERPATH_D3D11:
-		break;
 	}
 }
 
@@ -3510,10 +3496,6 @@ void R_Mesh_PrepareVertices_Generic_Arrays(int numvertices, const float *vertex3
 			return;
 		}
 		break;
-	case RENDERPATH_D3D9:
-	case RENDERPATH_D3D10:
-	case RENDERPATH_D3D11:
-		break;
 	}
 
 	// no quick path for this case, convert to vertex structs
@@ -3602,10 +3584,6 @@ void R_Mesh_PrepareVertices_Generic(int numvertices, const r_vertexgeneric_t *ve
 		R_Mesh_ColorPointer(      4, GL_UNSIGNED_BYTE, sizeof(*vertex), vertex->color4ub          , NULL, 0);
 		R_Mesh_TexCoordPointer(0, 2, GL_FLOAT        , sizeof(*vertex), vertex->texcoord2f        , NULL, 0);
 		break;
-	case RENDERPATH_D3D9:
-	case RENDERPATH_D3D10:
-	case RENDERPATH_D3D11:
-		break;
 	}
 }
 
@@ -3667,10 +3645,6 @@ void R_Mesh_PrepareVertices_Mesh_Arrays(int numvertices, const float *vertex3f,
 			return;
 		}
 		break;
-	case RENDERPATH_D3D9:
-	case RENDERPATH_D3D10:
-	case RENDERPATH_D3D11:
-		break;
 	}
 
 	vertex = R_Mesh_PrepareVertices_Mesh_Lock(numvertices);
@@ -3780,9 +3754,5 @@ void R_Mesh_PrepareVertices_Mesh(int numvertices, const r_vertexmesh_t *vertex,
 		R_Mesh_ColorPointer(      4, GL_UNSIGNED_BYTE, sizeof(*vertex), vertex->color4ub          , NULL, 0);
 		R_Mesh_TexCoordPointer(0, 2, GL_FLOAT        , sizeof(*vertex), vertex->texcoordtexture2f , NULL, 0);
 		break;
-	case RENDERPATH_D3D9:
-	case RENDERPATH_D3D10:
-	case RENDERPATH_D3D11:
-		break;
 	}
 }