X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=1654cd4bf68d01abf8852b5c325ac0587beeada5;hb=0ed2419ca3e44aa77a1a6f26c95ed6035ff41c6c;hp=04d3eb8d92057d44658cc2268af35553425b1350;hpb=475f59bf292f02ea9e17fb8aa96eb1288e7e9d6d;p=xonotic%2Fdarkplaces.git

diff --git a/gl_draw.c b/gl_draw.c
index 04d3eb8d..1654cd4b 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -1026,7 +1026,6 @@ static void _DrawQ_Setup(void)
 	GL_PolygonOffset(0, 0);
 	GL_DepthTest(false);
 	GL_Color(1,1,1,1);
-	GL_AlphaTest(false);
 }
 
 qboolean r_draw2d_force = false;
@@ -1917,7 +1916,6 @@ void DrawQ_LineLoop (drawqueuemesh_t *mesh, int flags)
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 		CHECKGLERROR
 		qglBegin(GL_LINE_LOOP);
 		for (num = 0;num < mesh->num_vertices;num++)
@@ -1938,6 +1936,12 @@ void DrawQ_LineLoop (drawqueuemesh_t *mesh, int flags)
 	case RENDERPATH_D3D11:
 		Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
 		break;
+	case RENDERPATH_SOFT:
+		//Con_DPrintf("FIXME SOFT %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
+		break;
+	case RENDERPATH_GLES2:
+		//Con_DPrintf("FIXME GLES2 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
+		return;
 	}
 }
 
@@ -1955,7 +1959,6 @@ void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, f
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 		CHECKGLERROR
 
 		//qglLineWidth(width);CHECKGLERROR
@@ -1977,6 +1980,12 @@ void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, f
 	case RENDERPATH_D3D11:
 		Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
 		break;
+	case RENDERPATH_SOFT:
+		//Con_DPrintf("FIXME SOFT %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
+		break;
+	case RENDERPATH_GLES2:
+		//Con_DPrintf("FIXME GLES2 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
+		return;
 	}
 }
 
@@ -1998,7 +2007,6 @@ void DrawQ_Lines (float width, int numlines, const float *vertex3f, const float
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 		CHECKGLERROR
 
 		R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1);
@@ -2019,6 +2027,12 @@ void DrawQ_Lines (float width, int numlines, const float *vertex3f, const float
 	case RENDERPATH_D3D11:
 		Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
 		break;
+	case RENDERPATH_SOFT:
+		//Con_DPrintf("FIXME SOFT %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
+		break;
+	case RENDERPATH_GLES2:
+		//Con_DPrintf("FIXME GLES2 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
+		return;
 	}
 }
 
@@ -2062,10 +2076,10 @@ void R_DrawGamma(void)
 	switch(vid.renderpath)
 	{
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 	case RENDERPATH_D3D9:
 	case RENDERPATH_D3D10:
 	case RENDERPATH_D3D11:
+	case RENDERPATH_GLES2:
 		if (vid_usinghwgamma || v_glslgamma.integer)
 			return;
 		break;
@@ -2074,6 +2088,8 @@ void R_DrawGamma(void)
 		if (vid_usinghwgamma)
 			return;
 		break;
+	case RENDERPATH_SOFT:
+		return;
 	}
 	// all the blends ignore depth
 //	R_Mesh_ResetTextureState();