X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_backend.c;h=dc46cc719dcd21016f55b6e36522f0dced00ab9d;hb=e6ca1459736cbd145657e386651a83056ca2474e;hp=b450a84fc45c6235963f0d32b962c49ce583ed7f;hpb=1c856177a95b7bbc4155cc45c4bf7c0effa54d1c;p=xonotic%2Fdarkplaces.git

diff --git a/gl_backend.c b/gl_backend.c
index b450a84f..dc46cc71 100644
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -147,7 +147,7 @@ typedef struct gl_state_s
 	int vertexbufferobject;
 	int elementbufferobject;
 	int framebufferobject;
-	int defaultframebufferobject; // RENDERPATH_GLES2 has a non-zero fbo provided by the OS
+	int defaultframebufferobject; // deal with platforms that use a non-zero default fbo
 	qboolean pointer_color_enabled;
 
 	int pointer_vertex_components;
@@ -275,7 +275,7 @@ static void R_Mesh_SetUseVBO(void)
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 		gl_state.usevbo_staticvertex = (vid.support.arb_vertex_buffer_object && gl_vbo.integer) || vid.forcevbo;
 		gl_state.usevbo_staticindex = (vid.support.arb_vertex_buffer_object && (gl_vbo.integer == 1 || gl_vbo.integer == 3)) || vid.forcevbo;
 		gl_state.usevbo_dynamicvertex = (vid.support.arb_vertex_buffer_object && gl_vbo_dynamicvertex.integer) || vid.forcevbo;
@@ -326,7 +326,7 @@ static void gl_backend_start(void)
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		// fetch current fbo here (default fbo is not 0 on some GLES devices)
 		if (vid.support.ext_framebuffer_object)
@@ -358,8 +358,8 @@ static void gl_backend_shutdown(void)
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 	case RENDERPATH_SOFT:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		break;
 	case RENDERPATH_D3D9:
@@ -404,8 +404,8 @@ static void gl_backend_devicelost(void)
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 	case RENDERPATH_SOFT:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		break;
 	case RENDERPATH_D3D9:
@@ -432,8 +432,8 @@ static void gl_backend_devicelost(void)
 		case RENDERPATH_GL11:
 		case RENDERPATH_GL13:
 		case RENDERPATH_GL20:
-		case RENDERPATH_CGGL:
 		case RENDERPATH_SOFT:
+		case RENDERPATH_GLES1:
 		case RENDERPATH_GLES2:
 			break;
 		case RENDERPATH_D3D9:
@@ -465,8 +465,8 @@ static void gl_backend_devicerestored(void)
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 	case RENDERPATH_SOFT:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		break;
 	case RENDERPATH_D3D9:
@@ -549,6 +549,32 @@ void R_Viewport_TransformToScreen(const r_viewport_t *v, const vec4_t in, vec4_t
 	out[2] = v->z + (out[2] * iw + 1.0f) * v->depth * 0.5f;
 }
 
+void GL_Finish(void)
+{
+	switch(vid.renderpath)
+	{
+	case RENDERPATH_GL11:
+	case RENDERPATH_GL13:
+	case RENDERPATH_GL20:
+	case RENDERPATH_GLES1:
+	case RENDERPATH_GLES2:
+		qglFinish();
+		break;
+	case RENDERPATH_D3D9:
+		//Con_DPrintf("FIXME D3D9 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
+		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_SOFT:
+		DPSOFTRAST_Finish();
+		break;
+	}
+}
+
 static int bboxedges[12][2] =
 {
 	// top
@@ -691,8 +717,8 @@ qboolean R_ScissorForBBox(const float *mins, const float *maxs, int *scissor)
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 	case RENDERPATH_SOFT:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		break;
 	}
@@ -712,7 +738,7 @@ static void R_Viewport_ApplyNearClipPlaneFloatGL(const r_viewport_t *v, float *m
 
 	VectorSet(normal, normalx, normaly, normalz);
 	Matrix4x4_Transform3x3(&v->viewmatrix, normal, clipPlane);
-	VectorScale(normal, dist, v3);
+	VectorScale(normal, -dist, v3);
 	Matrix4x4_Transform(&v->viewmatrix, v3, v4);
 	// FIXME: LordHavoc: I think this can be done more efficiently somehow but I can't remember the technique
 	clipPlane[3] = -DotProduct(v4, clipPlane);
@@ -775,8 +801,8 @@ void R_Viewport_InitOrtho(r_viewport_t *v, const matrix4x4_t *cameramatrix, int
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 	case RENDERPATH_SOFT:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		break;
 	case RENDERPATH_D3D9:
@@ -1024,10 +1050,10 @@ void R_Viewport_InitRectSideView(r_viewport_t *v, const matrix4x4_t *cameramatri
 	switch(vid.renderpath)
 	{
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL11:
 	case RENDERPATH_SOFT:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		break;
 	case RENDERPATH_D3D9:
@@ -1061,13 +1087,9 @@ void R_SetViewport(const r_viewport_t *v)
 
 	switch(vid.renderpath)
 	{
-	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
-//		CHECKGLERROR
-//		qglViewport(v->x, v->y, v->width, v->height);CHECKGLERROR
-//		break;
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL11:
+	case RENDERPATH_GLES1:
 		CHECKGLERROR
 		qglViewport(v->x, v->y, v->width, v->height);CHECKGLERROR
 		// Load the projection matrix into OpenGL
@@ -1099,6 +1121,7 @@ void R_SetViewport(const r_viewport_t *v)
 	case RENDERPATH_SOFT:
 		DPSOFTRAST_Viewport(v->x, v->y, v->width, v->height);
 		break;
+	case RENDERPATH_GL20:
 	case RENDERPATH_GLES2:
 		CHECKGLERROR
 		qglViewport(v->x, v->y, v->width, v->height);CHECKGLERROR
@@ -1143,7 +1166,7 @@ int R_Mesh_CreateFramebufferObject(rtexture_t *depthtexture, rtexture_t *colorte
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		if (!vid.support.ext_framebuffer_object)
 			return 0;
@@ -1172,7 +1195,7 @@ void R_Mesh_DestroyFramebufferObject(int fbo)
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		if (fbo)
 			qglDeleteFramebuffersEXT(1, (GLuint*)&fbo);
@@ -1229,7 +1252,7 @@ void R_Mesh_ResetRenderTargets(void)
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		if (gl_state.framebufferobject)
 		{
@@ -1273,7 +1296,7 @@ void R_Mesh_SetRenderTargets(int fbo, rtexture_t *depthtexture, rtexture_t *colo
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		if (gl_state.framebufferobject != fbo)
 		{
@@ -1375,7 +1398,7 @@ static void GL_Backend_ResetState(void)
 	gl_state.color4f[0] = gl_state.color4f[1] = gl_state.color4f[2] = gl_state.color4f[3] = 1;
 	gl_state.lockrange_first = 0;
 	gl_state.lockrange_count = 0;
-	gl_state.cullface = GL_NONE;
+	gl_state.cullface = GL_FRONT;
 	gl_state.cullfaceenable = false;
 	gl_state.polygonoffset[0] = 0;
 	gl_state.polygonoffset[1] = 0;
@@ -1406,71 +1429,9 @@ static void GL_Backend_ResetState(void)
 	case RENDERPATH_D3D11:
 		Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
 		break;
-	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
-		CHECKGLERROR
-
-		qglColorMask(1, 1, 1, 1);CHECKGLERROR
-		qglAlphaFunc(gl_state.alphafunc, gl_state.alphafuncvalue);CHECKGLERROR
-		qglDisable(GL_ALPHA_TEST);CHECKGLERROR
-		qglBlendFunc(gl_state.blendfunc1, gl_state.blendfunc2);CHECKGLERROR
-		qglDisable(GL_BLEND);CHECKGLERROR
-		qglCullFace(gl_state.cullface);CHECKGLERROR
-		qglDisable(GL_CULL_FACE);CHECKGLERROR
-		qglDepthFunc(GL_LEQUAL);CHECKGLERROR
-		qglEnable(GL_DEPTH_TEST);CHECKGLERROR
-		qglDepthMask(gl_state.depthmask);CHECKGLERROR
-		qglPolygonOffset(gl_state.polygonoffset[0], gl_state.polygonoffset[1]);
-
-		if (vid.support.arb_vertex_buffer_object)
-		{
-			qglBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
-			qglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
-		}
-
-		if (vid.support.ext_framebuffer_object)
-		{
-			qglBindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);
-			qglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-		}
-
-		qglVertexPointer(3, GL_FLOAT, sizeof(float[3]), NULL);CHECKGLERROR
-		qglEnableClientState(GL_VERTEX_ARRAY);CHECKGLERROR
-
-		qglColorPointer(4, GL_FLOAT, sizeof(float[4]), NULL);CHECKGLERROR
-		qglDisableClientState(GL_COLOR_ARRAY);CHECKGLERROR
-		qglColor4f(1, 1, 1, 1);CHECKGLERROR
-
-		if (vid.support.ext_framebuffer_object)
-			qglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, gl_state.framebufferobject);
-
-		gl_state.unit = MAX_TEXTUREUNITS;
-		gl_state.clientunit = MAX_TEXTUREUNITS;
-		for (i = 0;i < vid.teximageunits;i++)
-		{
-			GL_ActiveTexture(i);
-			qglBindTexture(GL_TEXTURE_2D, 0);CHECKGLERROR
-			if (vid.support.ext_texture_3d)
-			{
-				qglBindTexture(GL_TEXTURE_3D, 0);CHECKGLERROR
-			}
-			if (vid.support.arb_texture_cube_map)
-			{
-				qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);CHECKGLERROR
-			}
-		}
-
-		for (i = 0;i < vid.texarrayunits;i++)
-		{
-			GL_ClientActiveTexture(i);
-			GL_BindVBO(0);
-			qglTexCoordPointer(2, GL_FLOAT, sizeof(float[2]), NULL);CHECKGLERROR
-			qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
-		}
-		CHECKGLERROR
-		break;
-	case RENDERPATH_GL13:
 	case RENDERPATH_GL11:
+	case RENDERPATH_GL13:
+	case RENDERPATH_GLES1:
 		CHECKGLERROR
 
 		qglColorMask(1, 1, 1, 1);CHECKGLERROR
@@ -1546,6 +1507,7 @@ static void GL_Backend_ResetState(void)
 		DPSOFTRAST_SetRenderTargets(vid.width, vid.height, vid.softdepthpixels, vid.softpixels, NULL, NULL, NULL);
 		DPSOFTRAST_Viewport(0, 0, vid.width, vid.height);
 		break;
+	case RENDERPATH_GL20:
 	case RENDERPATH_GLES2:
 		CHECKGLERROR
 		qglColorMask(1, 1, 1, 1);CHECKGLERROR
@@ -1557,15 +1519,23 @@ static void GL_Backend_ResetState(void)
 		qglEnable(GL_DEPTH_TEST);CHECKGLERROR
 		qglDepthMask(gl_state.depthmask);CHECKGLERROR
 		qglPolygonOffset(gl_state.polygonoffset[0], gl_state.polygonoffset[1]);
-		qglBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
-		qglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
-		qglBindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);
-		qglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, gl_state.defaultframebufferobject);
-		qglEnableVertexAttribArray(GLES2ATTRIB_POSITION);
-		qglVertexAttribPointer(GLES2ATTRIB_POSITION, 3, GL_FLOAT, false, sizeof(float[3]), NULL);CHECKGLERROR
-		qglDisableVertexAttribArray(GLES2ATTRIB_COLOR);
-		qglVertexAttribPointer(GLES2ATTRIB_COLOR, 4, GL_FLOAT, false, sizeof(float[4]), NULL);CHECKGLERROR
-		qglVertexAttrib4f(GLES2ATTRIB_COLOR, 1, 1, 1, 1);
+	//	if (vid.renderpath == RENDERPATH_GL20)
+	//	{
+	//		qglAlphaFunc(gl_state.alphafunc, gl_state.alphafuncvalue);CHECKGLERROR
+	//		qglDisable(GL_ALPHA_TEST);CHECKGLERROR
+	//	}
+		if (vid.support.arb_vertex_buffer_object)
+		{
+			qglBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+			qglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
+		}
+		if (vid.support.ext_framebuffer_object)
+			qglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, gl_state.defaultframebufferobject);
+		qglEnableVertexAttribArray(GLSLATTRIB_POSITION);
+		qglVertexAttribPointer(GLSLATTRIB_POSITION, 3, GL_FLOAT, false, sizeof(float[3]), NULL);CHECKGLERROR
+		qglDisableVertexAttribArray(GLSLATTRIB_COLOR);
+		qglVertexAttribPointer(GLSLATTRIB_COLOR, 4, GL_FLOAT, false, sizeof(float[4]), NULL);CHECKGLERROR
+		qglVertexAttrib4f(GLSLATTRIB_COLOR, 1, 1, 1, 1);
 		gl_state.unit = MAX_TEXTUREUNITS;
 		gl_state.clientunit = MAX_TEXTUREUNITS;
 		for (i = 0;i < vid.teximageunits;i++)
@@ -1584,8 +1554,8 @@ static void GL_Backend_ResetState(void)
 		for (i = 0;i < vid.texarrayunits;i++)
 		{
 			GL_BindVBO(0);
-			qglVertexAttribPointer(i+GLES2ATTRIB_TEXCOORD0, 2, GL_FLOAT, false, sizeof(float[2]), NULL);CHECKGLERROR
-			qglDisableVertexAttribArray(i+GLES2ATTRIB_TEXCOORD0);CHECKGLERROR
+			qglVertexAttribPointer(i+GLSLATTRIB_TEXCOORD0, 2, GL_FLOAT, false, sizeof(float[2]), NULL);CHECKGLERROR
+			qglDisableVertexAttribArray(i+GLSLATTRIB_TEXCOORD0);CHECKGLERROR
 		}
 		CHECKGLERROR
 		break;
@@ -1602,7 +1572,7 @@ void GL_ActiveTexture(unsigned int num)
 		case RENDERPATH_GL11:
 		case RENDERPATH_GL13:
 		case RENDERPATH_GL20:
-		case RENDERPATH_CGGL:
+		case RENDERPATH_GLES1:
 		case RENDERPATH_GLES2:
 			if (qglActiveTexture)
 			{
@@ -1630,8 +1600,7 @@ void GL_ClientActiveTexture(unsigned int num)
 		{
 		case RENDERPATH_GL11:
 		case RENDERPATH_GL13:
-		case RENDERPATH_GL20:
-		case RENDERPATH_CGGL:
+		case RENDERPATH_GLES1:
 			if (qglActiveTexture)
 			{
 				CHECKGLERROR
@@ -1645,6 +1614,7 @@ void GL_ClientActiveTexture(unsigned int num)
 			break;
 		case RENDERPATH_SOFT:
 			break;
+		case RENDERPATH_GL20:
 		case RENDERPATH_GLES2:
 			break;
 		}
@@ -1664,7 +1634,7 @@ void GL_BlendFunc(int blendfunc1, int blendfunc2)
 		case RENDERPATH_GL11:
 		case RENDERPATH_GL13:
 		case RENDERPATH_GL20:
-		case RENDERPATH_CGGL:
+		case RENDERPATH_GLES1:
 		case RENDERPATH_GLES2:
 			CHECKGLERROR
 			qglBlendFunc(gl_state.blendfunc1, gl_state.blendfunc2);CHECKGLERROR
@@ -1738,7 +1708,7 @@ void GL_DepthMask(int state)
 		case RENDERPATH_GL11:
 		case RENDERPATH_GL13:
 		case RENDERPATH_GL20:
-		case RENDERPATH_CGGL:
+		case RENDERPATH_GLES1:
 		case RENDERPATH_GLES2:
 			CHECKGLERROR
 			qglDepthMask(gl_state.depthmask);CHECKGLERROR
@@ -1771,7 +1741,7 @@ void GL_DepthTest(int state)
 		case RENDERPATH_GL11:
 		case RENDERPATH_GL13:
 		case RENDERPATH_GL20:
-		case RENDERPATH_CGGL:
+		case RENDERPATH_GLES1:
 		case RENDERPATH_GLES2:
 			CHECKGLERROR
 			if (gl_state.depthtest)
@@ -1811,7 +1781,7 @@ void GL_DepthFunc(int state)
 		case RENDERPATH_GL11:
 		case RENDERPATH_GL13:
 		case RENDERPATH_GL20:
-		case RENDERPATH_CGGL:
+		case RENDERPATH_GLES1:
 		case RENDERPATH_GLES2:
 			CHECKGLERROR
 			qglDepthFunc(gl_state.depthfunc);CHECKGLERROR
@@ -1845,7 +1815,8 @@ void GL_DepthRange(float nearfrac, float farfrac)
 		case RENDERPATH_GL11:
 		case RENDERPATH_GL13:
 		case RENDERPATH_GL20:
-		case RENDERPATH_CGGL:
+		case RENDERPATH_GLES1:
+		case RENDERPATH_GLES2:
 			qglDepthRange(gl_state.depthrange[0], gl_state.depthrange[1]);
 			break;
 		case RENDERPATH_D3D9:
@@ -1871,11 +1842,6 @@ void GL_DepthRange(float nearfrac, float farfrac)
 		case RENDERPATH_SOFT:
 			DPSOFTRAST_DepthRange(gl_state.depthrange[0], gl_state.depthrange[1]);
 			break;
-		case RENDERPATH_GLES2:
-			//Con_DPrintf("FIXME GLES2 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
-			// FIXME: qglDepthRangef instead...  faster...
-			qglDepthRange(gl_state.depthrange[0], gl_state.depthrange[1]);
-			break;
 		}
 	}
 }
@@ -1887,7 +1853,8 @@ void R_SetStencilSeparate(qboolean enable, int writemask, int frontfail, int fro
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
+	case RENDERPATH_GLES2:
 		CHECKGLERROR
 		if (enable)
 		{
@@ -1943,9 +1910,6 @@ void R_SetStencilSeparate(qboolean enable, int writemask, int frontfail, int fro
 	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__);
-		break;
 	}
 }
 
@@ -1956,7 +1920,7 @@ void R_SetStencil(qboolean enable, int writemask, int fail, int zfail, int zpass
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		CHECKGLERROR
 		if (enable)
@@ -2013,7 +1977,7 @@ void GL_PolygonOffset(float planeoffset, float depthoffset)
 		case RENDERPATH_GL11:
 		case RENDERPATH_GL13:
 		case RENDERPATH_GL20:
-		case RENDERPATH_CGGL:
+		case RENDERPATH_GLES1:
 		case RENDERPATH_GLES2:
 			qglPolygonOffset(gl_state.polygonoffset[0], gl_state.polygonoffset[1]);
 			break;
@@ -2052,9 +2016,9 @@ void GL_SetMirrorState(qboolean state)
 		case RENDERPATH_GL11:
 		case RENDERPATH_GL13:
 		case RENDERPATH_GL20:
-		case RENDERPATH_CGGL:
+		case RENDERPATH_GLES1:
 		case RENDERPATH_GLES2:
-			qglCullFace(gl_state.cullface);
+			qglCullFace(gl_state.cullface);CHECKGLERROR
 			break;
 		case RENDERPATH_D3D9:
 #ifdef SUPPORTD3D
@@ -2089,7 +2053,7 @@ void GL_CullFace(int state)
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		CHECKGLERROR
 
@@ -2164,8 +2128,8 @@ void GL_AlphaTest(int state)
 		{
 		case RENDERPATH_GL11:
 		case RENDERPATH_GL13:
-		case RENDERPATH_GL20:
-		case RENDERPATH_CGGL:
+		case RENDERPATH_GLES1:
+			// only fixed function uses alpha test, other paths use pixel kill capability in shaders
 			CHECKGLERROR
 			if (gl_state.alphatest)
 			{
@@ -2178,54 +2142,17 @@ void GL_AlphaTest(int state)
 			break;
 		case RENDERPATH_D3D9:
 #ifdef SUPPORTD3D
-			IDirect3DDevice9_SetRenderState(vid_d3d9dev, D3DRS_ALPHATESTENABLE, gl_state.alphatest);
+//			IDirect3DDevice9_SetRenderState(vid_d3d9dev, D3DRS_ALPHATESTENABLE, gl_state.alphatest);
 #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_SOFT:
-			DPSOFTRAST_AlphaTest(gl_state.alphatest);
-			break;
-		case RENDERPATH_GLES2:
+//			DPSOFTRAST_AlphaTest(gl_state.alphatest);
 			break;
-		}
-	}
-}
-
-void GL_AlphaFunc(int state, float value)
-{
-	if (gl_state.alphafunc != state || gl_state.alphafuncvalue != value)
-	{
-		gl_state.alphafunc = state;
-		gl_state.alphafuncvalue = value;
-		switch(vid.renderpath)
-		{
-		case RENDERPATH_GL11:
-		case RENDERPATH_GL13:
 		case RENDERPATH_GL20:
-		case RENDERPATH_CGGL:
-			CHECKGLERROR
-			qglAlphaFunc(gl_state.alphafunc, gl_state.alphafuncvalue);CHECKGLERROR
-			break;
-		case RENDERPATH_D3D9:
-#ifdef SUPPORTD3D
-			IDirect3DDevice9_SetRenderState(vid_d3d9dev, D3DRS_ALPHAFUNC, d3dcmpforglfunc(gl_state.alphafunc));
-			IDirect3DDevice9_SetRenderState(vid_d3d9dev, D3DRS_ALPHAREF, (int)bound(0, value * 256.0f, 255));
-#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_SOFT:
-			DPSOFTRAST_AlphaFunc(gl_state.alphafunc, gl_state.alphafuncvalue);
-			break;
 		case RENDERPATH_GLES2:
 			break;
 		}
@@ -2244,7 +2171,7 @@ void GL_ColorMask(int r, int g, int b, int a)
 		case RENDERPATH_GL11:
 		case RENDERPATH_GL13:
 		case RENDERPATH_GL20:
-		case RENDERPATH_CGGL:
+		case RENDERPATH_GLES1:
 		case RENDERPATH_GLES2:
 			CHECKGLERROR
 			qglColorMask((GLboolean)r, (GLboolean)g, (GLboolean)b, (GLboolean)a);CHECKGLERROR
@@ -2279,8 +2206,7 @@ void GL_Color(float cr, float cg, float cb, float ca)
 		{
 		case RENDERPATH_GL11:
 		case RENDERPATH_GL13:
-		case RENDERPATH_GL20:
-		case RENDERPATH_CGGL:
+		case RENDERPATH_GLES1:
 			CHECKGLERROR
 			qglColor4f(gl_state.color4f[0], gl_state.color4f[1], gl_state.color4f[2], gl_state.color4f[3]);
 			CHECKGLERROR
@@ -2293,8 +2219,9 @@ void GL_Color(float cr, float cg, float cb, float ca)
 		case RENDERPATH_SOFT:
 			DPSOFTRAST_Color4f(cr, cg, cb, ca);
 			break;
+		case RENDERPATH_GL20:
 		case RENDERPATH_GLES2:
-			qglVertexAttrib4f(GLES2ATTRIB_COLOR, cr, cg, cb, ca);
+			qglVertexAttrib4f(GLSLATTRIB_COLOR, cr, cg, cb, ca);
 			break;
 		}
 	}
@@ -2307,7 +2234,7 @@ void GL_Scissor (int x, int y, int width, int height)
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		CHECKGLERROR
 		qglScissor(x, y,width,height);
@@ -2347,7 +2274,7 @@ void GL_ScissorTest(int state)
 		case RENDERPATH_GL11:
 		case RENDERPATH_GL13:
 		case RENDERPATH_GL20:
-		case RENDERPATH_CGGL:
+		case RENDERPATH_GLES1:
 		case RENDERPATH_GLES2:
 			CHECKGLERROR
 			if(gl_state.scissortest)
@@ -2390,7 +2317,7 @@ void GL_Clear(int mask, const float *colorvalue, float depthvalue, int stencilva
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		CHECKGLERROR
 		if (mask & GL_COLOR_BUFFER_BIT)
@@ -2434,7 +2361,7 @@ void GL_ReadPixelsBGRA(int x, int y, int width, int height, unsigned char *outpi
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		CHECKGLERROR
 		qglReadPixels(x, y, width, height, GL_BGRA, GL_UNSIGNED_BYTE, outpixels);CHECKGLERROR
@@ -2542,6 +2469,19 @@ unsigned int GL_Backend_CompileProgram(int vertexstrings_count, const char **ver
 	if (!programobject)
 		return 0;
 
+	qglBindAttribLocation(programobject, GLSLATTRIB_POSITION , "Attrib_Position" );
+	qglBindAttribLocation(programobject, GLSLATTRIB_COLOR    , "Attrib_Color"    );
+	qglBindAttribLocation(programobject, GLSLATTRIB_TEXCOORD0, "Attrib_TexCoord0");
+	qglBindAttribLocation(programobject, GLSLATTRIB_TEXCOORD1, "Attrib_TexCoord1");
+	qglBindAttribLocation(programobject, GLSLATTRIB_TEXCOORD2, "Attrib_TexCoord2");
+	qglBindAttribLocation(programobject, GLSLATTRIB_TEXCOORD3, "Attrib_TexCoord3");
+	qglBindAttribLocation(programobject, GLSLATTRIB_TEXCOORD4, "Attrib_TexCoord4");
+	qglBindAttribLocation(programobject, GLSLATTRIB_TEXCOORD5, "Attrib_TexCoord5");
+	qglBindAttribLocation(programobject, GLSLATTRIB_TEXCOORD6, "Attrib_TexCoord6");
+	qglBindAttribLocation(programobject, GLSLATTRIB_TEXCOORD7, "Attrib_TexCoord7");
+	if(vid.support.gl20shaders130)
+		qglBindFragDataLocation(programobject, 0, "dp_FragColor");
+
 	if (vertexstrings_count && !GL_Backend_CompileShader(programobject, GL_VERTEX_SHADER, "vertex", vertexstrings_count, vertexstrings_list))
 		goto cleanup;
 
@@ -2632,7 +2572,7 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int firsttriangle, int numtri
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		// check if the user specified to ignore static index buffers
 		if (!gl_state.usevbo_staticindex || (gl_vbo.integer == 3 && !vid.forcevbo && (element3i_bufferoffset || element3s_bufferoffset)))
@@ -2751,7 +2691,6 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int firsttriangle, int numtri
 		case RENDERPATH_GL11:
 		case RENDERPATH_GL13:
 		case RENDERPATH_GL20:
-		case RENDERPATH_CGGL:
 			CHECKGLERROR
 			if (gl_mesh_testmanualfeeding.integer)
 			{
@@ -2976,10 +2915,39 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int firsttriangle, int numtri
 		case RENDERPATH_SOFT:
 			DPSOFTRAST_DrawTriangles(firstvertex, numvertices, numtriangles, element3i, element3s);
 			break;
+		case RENDERPATH_GLES1:
 		case RENDERPATH_GLES2:
 			// GLES does not have glDrawRangeElements, and generally
 			// underperforms with index buffers, so this code path is
 			// relatively straightforward...
+#if 0
+			if (gl_paranoid.integer)
+			{
+				int r, prog, enabled, i;
+				GLsizei 	attriblength;
+				GLint 		attribsize;
+				GLenum		attribtype;
+				GLchar		attribname[1024];
+				r = qglCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);CHECKGLERROR
+				if (r != GL_FRAMEBUFFER_COMPLETE_EXT)
+					Con_DPrintf("fbo %i not complete (default %i)\n", gl_state.framebufferobject, gl_state.defaultframebufferobject);
+#ifndef GL_CURRENT_PROGRAM
+#define GL_CURRENT_PROGRAM 0x8B8D
+#endif
+				qglGetIntegerv(GL_CURRENT_PROGRAM, &r);CHECKGLERROR
+				if (r < 0 || r > 10000)
+					Con_DPrintf("GL_CURRENT_PROGRAM = %i\n", r);
+				prog = r;
+				for (i = 0;i < 8;i++)
+				{
+					qglGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &r);CHECKGLERROR
+					if (!r)
+						continue;
+					qglGetActiveAttrib(prog, i, sizeof(attribname), &attriblength, &attribsize, &attribtype, attribname);CHECKGLERROR
+					Con_DPrintf("prog %i position %i length %i size %04X type %i name \"%s\"\n", prog, i, (int)attriblength, (int)attribsize, (int)attribtype, (char *)attribname);
+				}
+			}
+#endif
 			if (element3s)
 			{
 				qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_SHORT, element3s);
@@ -3043,7 +3011,7 @@ void R_Mesh_UpdateMeshBuffer(r_meshbuffer_t *buffer, const void *data, size_t si
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		if (!buffer->bufferobject)
 			qglGenBuffersARB(1, (GLuint *)&buffer->bufferobject);
@@ -3125,7 +3093,7 @@ void R_Mesh_DestroyMeshBuffer(r_meshbuffer_t *buffer)
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		qglDeleteBuffersARB(1, (GLuint *)&buffer->bufferobject);
 		break;
@@ -3181,8 +3149,7 @@ void R_Mesh_VertexPointer(int components, int gltype, size_t stride, const void
 	{
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
-	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 		if (gl_state.pointer_vertex_components != components || gl_state.pointer_vertex_gltype != gltype || gl_state.pointer_vertex_stride != stride || gl_state.pointer_vertex_pointer != pointer || gl_state.pointer_vertex_vertexbuffer != vertexbuffer || gl_state.pointer_vertex_offset != bufferoffset)
 		{
 			int bufferobject = vertexbuffer ? vertexbuffer->bufferobject : 0;
@@ -3197,6 +3164,7 @@ void R_Mesh_VertexPointer(int components, int gltype, size_t stride, const void
 			qglVertexPointer(components, gltype, stride, bufferobject ? (void *)bufferoffset : pointer);CHECKGLERROR
 		}
 		break;
+	case RENDERPATH_GL20:
 	case RENDERPATH_GLES2:
 		if (gl_state.pointer_vertex_components != components || gl_state.pointer_vertex_gltype != gltype || gl_state.pointer_vertex_stride != stride || gl_state.pointer_vertex_pointer != pointer || gl_state.pointer_vertex_vertexbuffer != vertexbuffer || gl_state.pointer_vertex_offset != bufferoffset)
 		{
@@ -3209,7 +3177,7 @@ void R_Mesh_VertexPointer(int components, int gltype, size_t stride, const void
 			gl_state.pointer_vertex_offset = bufferoffset;
 			CHECKGLERROR
 			GL_BindVBO(bufferobject);
-			qglVertexAttribPointer(GLES2ATTRIB_POSITION, components, gltype, false, stride, bufferobject ? (void *)bufferoffset : pointer);CHECKGLERROR
+			qglVertexAttribPointer(GLSLATTRIB_POSITION, components, gltype, false, stride, bufferobject ? (void *)bufferoffset : pointer);CHECKGLERROR
 		}
 		break;
 	case RENDERPATH_D3D9:
@@ -3228,8 +3196,7 @@ void R_Mesh_ColorPointer(int components, int gltype, size_t stride, const void *
 	{
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
-	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 		CHECKGLERROR
 		if (pointer)
 		{
@@ -3267,6 +3234,7 @@ void R_Mesh_ColorPointer(int components, int gltype, size_t stride, const void *
 			}
 		}
 		break;
+	case RENDERPATH_GL20:
 	case RENDERPATH_GLES2:
 		CHECKGLERROR
 		if (pointer)
@@ -3277,7 +3245,7 @@ void R_Mesh_ColorPointer(int components, int gltype, size_t stride, const void *
 			{
 				gl_state.pointer_color_enabled = true;
 				CHECKGLERROR
-				qglEnableVertexAttribArray(GLES2ATTRIB_COLOR);CHECKGLERROR
+				qglEnableVertexAttribArray(GLSLATTRIB_COLOR);CHECKGLERROR
 			}
 			if (gl_state.pointer_color_components != components || gl_state.pointer_color_gltype != gltype || gl_state.pointer_color_stride != stride || gl_state.pointer_color_pointer != pointer || gl_state.pointer_color_vertexbuffer != vertexbuffer || gl_state.pointer_color_offset != bufferoffset)
 			{
@@ -3289,7 +3257,7 @@ void R_Mesh_ColorPointer(int components, int gltype, size_t stride, const void *
 				gl_state.pointer_color_offset = bufferoffset;
 				CHECKGLERROR
 				GL_BindVBO(bufferobject);
-				qglVertexAttribPointer(GLES2ATTRIB_COLOR, components, gltype, false, stride, bufferobject ? (void *)bufferoffset : pointer);CHECKGLERROR
+				qglVertexAttribPointer(GLSLATTRIB_COLOR, components, gltype, false, stride, bufferobject ? (void *)bufferoffset : pointer);CHECKGLERROR
 			}
 		}
 		else
@@ -3299,9 +3267,9 @@ void R_Mesh_ColorPointer(int components, int gltype, size_t stride, const void *
 			{
 				gl_state.pointer_color_enabled = false;
 				CHECKGLERROR
-				qglDisableVertexAttribArray(GLES2ATTRIB_COLOR);CHECKGLERROR
+				qglDisableVertexAttribArray(GLSLATTRIB_COLOR);CHECKGLERROR
 				// when color array is on the glColor gets trashed, set it again
-				qglVertexAttrib4f(GLES2ATTRIB_COLOR, gl_state.color4f[0], gl_state.color4f[1], gl_state.color4f[2], gl_state.color4f[3]);CHECKGLERROR
+				qglVertexAttrib4f(GLSLATTRIB_COLOR, gl_state.color4f[0], gl_state.color4f[1], gl_state.color4f[2], gl_state.color4f[3]);CHECKGLERROR
 			}
 		}
 		break;
@@ -3323,8 +3291,7 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, int components, int gltype, si
 	{
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
-	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 		CHECKGLERROR
 		if (pointer)
 		{
@@ -3361,6 +3328,7 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, int components, int gltype, si
 			}
 		}
 		break;
+	case RENDERPATH_GL20:
 	case RENDERPATH_GLES2:
 		CHECKGLERROR
 		if (pointer)
@@ -3370,7 +3338,7 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, int components, int gltype, si
 			if (!unit->arrayenabled)
 			{
 				unit->arrayenabled = true;
-				qglEnableVertexAttribArray(unitnum+GLES2ATTRIB_TEXCOORD0);CHECKGLERROR
+				qglEnableVertexAttribArray(unitnum+GLSLATTRIB_TEXCOORD0);CHECKGLERROR
 			}
 			// texcoord array
 			if (unit->pointer_texcoord_components != components || unit->pointer_texcoord_gltype != gltype || unit->pointer_texcoord_stride != stride || unit->pointer_texcoord_pointer != pointer || unit->pointer_texcoord_vertexbuffer != vertexbuffer || unit->pointer_texcoord_offset != bufferoffset)
@@ -3382,7 +3350,7 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, int components, int gltype, si
 				unit->pointer_texcoord_vertexbuffer = vertexbuffer;
 				unit->pointer_texcoord_offset = bufferoffset;
 				GL_BindVBO(bufferobject);
-				qglVertexAttribPointer(unitnum+GLES2ATTRIB_TEXCOORD0, components, gltype, false, stride, bufferobject ? (void *)bufferoffset : pointer);CHECKGLERROR
+				qglVertexAttribPointer(unitnum+GLSLATTRIB_TEXCOORD0, components, gltype, false, stride, bufferobject ? (void *)bufferoffset : pointer);CHECKGLERROR
 			}
 		}
 		else
@@ -3391,7 +3359,7 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, int components, int gltype, si
 			if (unit->arrayenabled)
 			{
 				unit->arrayenabled = false;
-				qglDisableVertexAttribArray(unitnum+GLES2ATTRIB_TEXCOORD0);CHECKGLERROR
+				qglDisableVertexAttribArray(unitnum+GLSLATTRIB_TEXCOORD0);CHECKGLERROR
 			}
 		}
 		break;
@@ -3424,7 +3392,7 @@ void R_Mesh_CopyToTexture(rtexture_t *tex, int tx, int ty, int sx, int sy, int w
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		R_Mesh_TexBind(0, tex);
 		GL_ActiveTexture(0);CHECKGLERROR
@@ -3473,6 +3441,23 @@ void R_Mesh_CopyToTexture(rtexture_t *tex, int tx, int ty, int sx, int sy, int w
 int d3drswrap[16] = {D3DRS_WRAP0, D3DRS_WRAP1, D3DRS_WRAP2, D3DRS_WRAP3, D3DRS_WRAP4, D3DRS_WRAP5, D3DRS_WRAP6, D3DRS_WRAP7, D3DRS_WRAP8, D3DRS_WRAP9, D3DRS_WRAP10, D3DRS_WRAP11, D3DRS_WRAP12, D3DRS_WRAP13, D3DRS_WRAP14, D3DRS_WRAP15};
 #endif
 
+void R_Mesh_ClearBindingsForTexture(int texnum)
+{
+	gltextureunit_t *unit;
+	unsigned int unitnum;
+	// this doesn't really unbind the texture, but it does prevent a mistaken "do nothing" behavior on the next time this same texnum is bound on the same unit as the same type (this mainly affects r_shadow_bouncegrid because 3D textures are so rarely used)
+	for (unitnum = 0;unitnum < vid.teximageunits;unitnum++)
+	{
+		unit = gl_state.units + unitnum;
+		if (unit->t2d == texnum)
+			unit->t2d = -1;
+		if (unit->t3d == texnum)
+			unit->t3d = -1;
+		if (unit->tcubemap == texnum)
+			unit->tcubemap = -1;
+	}
+}
+
 void R_Mesh_TexBind(unsigned int unitnum, rtexture_t *tex)
 {
 	gltextureunit_t *unit = gl_state.units + unitnum;
@@ -3484,7 +3469,6 @@ void R_Mesh_TexBind(unsigned int unitnum, rtexture_t *tex)
 	switch(vid.renderpath)
 	{
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 	case RENDERPATH_GLES2:
 		if (!tex)
 		{
@@ -3502,8 +3486,9 @@ void R_Mesh_TexBind(unsigned int unitnum, rtexture_t *tex)
 		case GL_TEXTURE_CUBE_MAP_ARB: if (unit->tcubemap != texnum) {GL_ActiveTexture(unitnum);unit->tcubemap = texnum;qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR}break;
 		}
 		break;
-	case RENDERPATH_GL13:
 	case RENDERPATH_GL11:
+	case RENDERPATH_GL13:
+	case RENDERPATH_GLES1:
 		unit->texture = tex;
 		tex2d = 0;
 		tex3d = 0;
@@ -3599,12 +3584,11 @@ void R_Mesh_TexBind(unsigned int unitnum, rtexture_t *tex)
 				if (!tex)
 					return;
 			}
+			// upload texture if needed
+			R_GetTexture(tex);
 			if (unit->texture == tex)
 				return;
 			unit->texture = tex;
-			// upload texture if needed
-			if (tex->dirty)
-				R_RealGetTexture(tex);
 			IDirect3DDevice9_SetTexture(vid_d3d9dev, unitnum, (IDirect3DBaseTexture9*)tex->d3dtexture);
 			//IDirect3DDevice9_SetRenderState(vid_d3d9dev, d3drswrap[unitnum], (tex->flags & TEXF_CLAMP) ? (D3DWRAPCOORD_0 | D3DWRAPCOORD_1 | D3DWRAPCOORD_2) : 0);
 			IDirect3DDevice9_SetSamplerState(vid_d3d9dev, unitnum, D3DSAMP_ADDRESSU, tex->d3daddressu);
@@ -3634,10 +3618,11 @@ void R_Mesh_TexBind(unsigned int unitnum, rtexture_t *tex)
 			if (!tex)
 				return;
 		}
+		texnum = R_GetTexture(tex);
 		if (unit->texture == tex)
 			return;
 		unit->texture = tex;
-		DPSOFTRAST_SetTexture(unitnum, R_GetTexture(tex));
+		DPSOFTRAST_SetTexture(unitnum, texnum);
 		break;
 	}
 }
@@ -3650,7 +3635,8 @@ void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix)
 	case RENDERPATH_GL11:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
+	case RENDERPATH_GLES1:
+	case RENDERPATH_GLES2:
 		if (matrix && matrix->m[3][3])
 		{
 			// texmatrix specified, check if it is different
@@ -3688,8 +3674,6 @@ void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix)
 		break;
 	case RENDERPATH_SOFT:
 		break;
-	case RENDERPATH_GLES2:
-		break;
 	}
 }
 
@@ -3700,11 +3684,11 @@ void R_Mesh_TexCombine(unsigned int unitnum, int combinergb, int combinealpha, i
 	switch(vid.renderpath)
 	{
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 	case RENDERPATH_GLES2:
 		// do nothing
 		break;
 	case RENDERPATH_GL13:
+	case RENDERPATH_GLES1:
 		// GL_ARB_texture_env_combine
 		if (!combinergb)
 			combinergb = GL_MODULATE;
@@ -3786,115 +3770,27 @@ void R_Mesh_ResetTextureState(void)
 
 	BACKENDACTIVECHECK
 
-	CHECKGLERROR
+	for (unitnum = 0;unitnum < vid.teximageunits;unitnum++)
+		R_Mesh_TexBind(unitnum, NULL);
+	for (unitnum = 0;unitnum < vid.texarrayunits;unitnum++)
+		R_Mesh_TexCoordPointer(unitnum, 2, GL_FLOAT, sizeof(float[2]), NULL, NULL, 0);
 	switch(vid.renderpath)
 	{
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
-		for (unitnum = 0;unitnum < vid.teximageunits;unitnum++)
-		{
-			gltextureunit_t *unit = gl_state.units + unitnum;
-			if (unit->t2d)
-			{
-				unit->t2d = 0;
-				GL_ActiveTexture(unitnum);
-				qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR
-			}
-			if (unit->t3d)
-			{
-				unit->t3d = 0;
-				GL_ActiveTexture(unitnum);
-				qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR
-			}
-			if (unit->tcubemap)
-			{
-				unit->tcubemap = 0;
-				GL_ActiveTexture(unitnum);
-				qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR
-			}
-		}
-		for (unitnum = 0;unitnum < vid.texarrayunits;unitnum++)
-		{
-			gltextureunit_t *unit = gl_state.units + unitnum;
-			if (unit->arrayenabled)
-			{
-				unit->arrayenabled = false;
-				GL_ClientActiveTexture(unitnum);
-				qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
-			}
-		}
-		for (unitnum = 0;unitnum < vid.texunits;unitnum++)
-		{
-			gltextureunit_t *unit = gl_state.units + unitnum;
-			if (unit->texmatrixenabled)
-			{
-				unit->texmatrixenabled = false;
-				unit->matrix = identitymatrix;
-				CHECKGLERROR
-				GL_ActiveTexture(unitnum);
-				qglMatrixMode(GL_TEXTURE);CHECKGLERROR
-				qglLoadIdentity();CHECKGLERROR
-				qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
-			}
-		}
-		break;
-	case RENDERPATH_GL13:
-	case RENDERPATH_GL11:
-		for (unitnum = 0;unitnum < vid.texunits;unitnum++)
-		{
-			gltextureunit_t *unit = gl_state.units + unitnum;
-			if (unit->t2d)
-			{
-				unit->t2d = 0;
-				GL_ActiveTexture(unitnum);
-				qglDisable(GL_TEXTURE_2D);CHECKGLERROR
-				qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR
-			}
-			if (unit->t3d)
-			{
-				unit->t3d = 0;
-				GL_ActiveTexture(unitnum);
-				qglDisable(GL_TEXTURE_3D);CHECKGLERROR
-				qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR
-			}
-			if (unit->tcubemap)
-			{
-				unit->tcubemap = 0;
-				GL_ActiveTexture(unitnum);
-				qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
-				qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR
-			}
-			if (unit->arrayenabled)
-			{
-				unit->arrayenabled = false;
-				GL_ClientActiveTexture(unitnum);
-				qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
-			}
-			if (unit->texmatrixenabled)
-			{
-				unit->texmatrixenabled = false;
-				unit->matrix = identitymatrix;
-				CHECKGLERROR
-				GL_ActiveTexture(unitnum);
-				qglMatrixMode(GL_TEXTURE);CHECKGLERROR
-				qglLoadIdentity();CHECKGLERROR
-				qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
-			}
-			if (unit->combine != GL_MODULATE)
-			{
-				unit->combine = GL_MODULATE;
-				GL_ActiveTexture(unitnum);
-				qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combine);CHECKGLERROR
-			}
-		}
-		break;
+	case RENDERPATH_GLES2:
 	case RENDERPATH_D3D9:
 	case RENDERPATH_D3D10:
 	case RENDERPATH_D3D11:
-		break;
 	case RENDERPATH_SOFT:
 		break;
-	case RENDERPATH_GLES2:
+	case RENDERPATH_GL11:
+	case RENDERPATH_GL13:
+	case RENDERPATH_GLES1:
+		for (unitnum = 0;unitnum < vid.texunits;unitnum++)
+		{
+			R_Mesh_TexCombine(unitnum, GL_MODULATE, GL_MODULATE, 1, 1);
+			R_Mesh_TexMatrix(unitnum, NULL);
+		}
 		break;
 	}
 }
@@ -3915,7 +3811,7 @@ D3DVERTEXELEMENT9 r_vertex3f_d3d9elements[] =
 D3DVERTEXELEMENT9 r_vertexgeneric_d3d9elements[] =
 {
 	{0, (int)((size_t)&((r_vertexgeneric_t *)0)->vertex3f  ), D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0},
-	{0, (int)((size_t)&((r_vertexgeneric_t *)0)->color4ub  ), D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0},
+	{0, (int)((size_t)&((r_vertexgeneric_t *)0)->color4f   ), D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0},
 	{0, (int)((size_t)&((r_vertexgeneric_t *)0)->texcoord2f), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0},
 	D3DDECL_END()
 };
@@ -3923,7 +3819,7 @@ D3DVERTEXELEMENT9 r_vertexgeneric_d3d9elements[] =
 D3DVERTEXELEMENT9 r_vertexmesh_d3d9elements[] =
 {
 	{0, (int)((size_t)&((r_vertexmesh_t *)0)->vertex3f          ), D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0},
-	{0, (int)((size_t)&((r_vertexmesh_t *)0)->color4ub          ), D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0},
+	{0, (int)((size_t)&((r_vertexmesh_t *)0)->color4f           ), D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0},
 	{0, (int)((size_t)&((r_vertexmesh_t *)0)->texcoordtexture2f ), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0},
 	{0, (int)((size_t)&((r_vertexmesh_t *)0)->svector3f         ), D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 1},
 	{0, (int)((size_t)&((r_vertexmesh_t *)0)->tvector3f         ), D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 2},
@@ -3946,9 +3842,9 @@ static void R_Mesh_InitVertexDeclarations(void)
 	switch(vid.renderpath)
 	{
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL11:
+	case RENDERPATH_GLES1:
 	case RENDERPATH_GLES2:
 		break;
 	case RENDERPATH_D3D9:
@@ -3999,7 +3895,6 @@ void R_Mesh_PrepareVertices_Vertex3f(int numvertices, const float *vertex3f, con
 	switch(vid.renderpath)
 	{
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 	case RENDERPATH_GLES2:
 		if (vertexbuffer)
 		{
@@ -4023,6 +3918,7 @@ void R_Mesh_PrepareVertices_Vertex3f(int numvertices, const float *vertex3f, con
 		}
 		break;
 	case RENDERPATH_GL13:
+	case RENDERPATH_GLES1:
 		if (vertexbuffer)
 		{
 			R_Mesh_VertexPointer(3, GL_FLOAT, sizeof(float[3]), vertex3f, vertexbuffer, 0);
@@ -4113,7 +4009,6 @@ void R_Mesh_PrepareVertices_Generic_Arrays(int numvertices, const float *vertex3
 	switch(vid.renderpath)
 	{
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 	case RENDERPATH_GLES2:
 		if (!vid.useinterleavedarrays)
 		{
@@ -4127,8 +4022,9 @@ void R_Mesh_PrepareVertices_Generic_Arrays(int numvertices, const float *vertex3
 			return;
 		}
 		break;
-	case RENDERPATH_GL13:
 	case RENDERPATH_GL11:
+	case RENDERPATH_GL13:
+	case RENDERPATH_GLES1:
 		if (!vid.useinterleavedarrays)
 		{
 			R_Mesh_VertexPointer(3, GL_FLOAT, sizeof(float[3]), vertex3f, NULL, 0);
@@ -4163,19 +4059,12 @@ void R_Mesh_PrepareVertices_Generic_Arrays(int numvertices, const float *vertex3
 	if (color4f)
 	{
 		for (i = 0;i < numvertices;i++)
-			Vector4Scale(color4f + 4*i, 255.0f, vertex[i].color4ub);
+			Vector4Copy(color4f + 4*i, vertex[i].color4f);
 	}
 	else
 	{
-		float tempcolor4f[4];
-		unsigned char tempcolor4ub[4];
-		Vector4Scale(gl_state.color4f, 255.0f, tempcolor4f);
-		tempcolor4ub[0] = (unsigned char)bound(0.0f, tempcolor4f[0], 255.0f);
-		tempcolor4ub[1] = (unsigned char)bound(0.0f, tempcolor4f[1], 255.0f);
-		tempcolor4ub[2] = (unsigned char)bound(0.0f, tempcolor4f[2], 255.0f);
-		tempcolor4ub[3] = (unsigned char)bound(0.0f, tempcolor4f[3], 255.0f);
 		for (i = 0;i < numvertices;i++)
-			Vector4Copy(tempcolor4ub, vertex[i].color4ub);
+			Vector4Copy(gl_state.color4f, vertex[i].color4f);
 	}
 	if (texcoord2f)
 		for (i = 0;i < numvertices;i++)
@@ -4200,12 +4089,11 @@ void R_Mesh_PrepareVertices_Generic(int numvertices, const r_vertexgeneric_t *ve
 	switch(vid.renderpath)
 	{
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 	case RENDERPATH_GLES2:
 		if (vertexbuffer)
 		{
 			R_Mesh_VertexPointer(     3, GL_FLOAT        , sizeof(*vertex), vertex->vertex3f          , vertexbuffer, (int)((unsigned char *)vertex->vertex3f           - (unsigned char *)vertex));
-			R_Mesh_ColorPointer(      4, GL_UNSIGNED_BYTE, sizeof(*vertex), vertex->color4ub          , vertexbuffer, (int)((unsigned char *)vertex->color4ub           - (unsigned char *)vertex));
+			R_Mesh_ColorPointer(      4, GL_FLOAT        , sizeof(*vertex), vertex->color4f           , vertexbuffer, (int)((unsigned char *)vertex->color4f            - (unsigned char *)vertex));
 			R_Mesh_TexCoordPointer(0, 2, GL_FLOAT        , sizeof(*vertex), vertex->texcoord2f        , vertexbuffer, (int)((unsigned char *)vertex->texcoord2f         - (unsigned char *)vertex));
 			R_Mesh_TexCoordPointer(1, 2, GL_FLOAT, sizeof(float[2]), NULL, NULL, 0);
 			R_Mesh_TexCoordPointer(2, 2, GL_FLOAT, sizeof(float[2]), NULL, NULL, 0);
@@ -4215,7 +4103,7 @@ void R_Mesh_PrepareVertices_Generic(int numvertices, const r_vertexgeneric_t *ve
 		else
 		{
 			R_Mesh_VertexPointer(     3, GL_FLOAT        , sizeof(*vertex), vertex->vertex3f          , NULL, 0);
-			R_Mesh_ColorPointer(      4, GL_UNSIGNED_BYTE, sizeof(*vertex), vertex->color4ub          , NULL, 0);
+			R_Mesh_ColorPointer(      4, GL_FLOAT        , sizeof(*vertex), vertex->color4f           , NULL, 0);
 			R_Mesh_TexCoordPointer(0, 2, GL_FLOAT        , sizeof(*vertex), vertex->texcoord2f        , NULL, 0);
 			R_Mesh_TexCoordPointer(1, 2, GL_FLOAT, sizeof(float[2]), NULL, NULL, 0);
 			R_Mesh_TexCoordPointer(2, 2, GL_FLOAT, sizeof(float[2]), NULL, NULL, 0);
@@ -4224,17 +4112,18 @@ void R_Mesh_PrepareVertices_Generic(int numvertices, const r_vertexgeneric_t *ve
 		}
 		break;
 	case RENDERPATH_GL13:
+	case RENDERPATH_GLES1:
 		if (vertexbuffer)
 		{
 			R_Mesh_VertexPointer(     3, GL_FLOAT        , sizeof(*vertex), vertex->vertex3f          , vertexbuffer, (int)((unsigned char *)vertex->vertex3f           - (unsigned char *)vertex));
-			R_Mesh_ColorPointer(      4, GL_UNSIGNED_BYTE, sizeof(*vertex), vertex->color4ub          , vertexbuffer, (int)((unsigned char *)vertex->color4ub           - (unsigned char *)vertex));
+			R_Mesh_ColorPointer(      4, GL_FLOAT        , sizeof(*vertex), vertex->color4f           , vertexbuffer, (int)((unsigned char *)vertex->color4f            - (unsigned char *)vertex));
 			R_Mesh_TexCoordPointer(0, 2, GL_FLOAT        , sizeof(*vertex), vertex->texcoord2f        , vertexbuffer, (int)((unsigned char *)vertex->texcoord2f         - (unsigned char *)vertex));
 			R_Mesh_TexCoordPointer(1, 2, GL_FLOAT, sizeof(float[2]), NULL, NULL, 0);
 		}
 		else
 		{
 			R_Mesh_VertexPointer(     3, GL_FLOAT        , sizeof(*vertex), vertex->vertex3f          , NULL, 0);
-			R_Mesh_ColorPointer(      4, GL_UNSIGNED_BYTE, sizeof(*vertex), vertex->color4ub          , NULL, 0);
+			R_Mesh_ColorPointer(      4, GL_FLOAT        , sizeof(*vertex), vertex->color4f           , NULL, 0);
 			R_Mesh_TexCoordPointer(0, 2, GL_FLOAT        , sizeof(*vertex), vertex->texcoord2f        , NULL, 0);
 			R_Mesh_TexCoordPointer(1, 2, GL_FLOAT, sizeof(float[2]), NULL, NULL, 0);
 		}
@@ -4243,13 +4132,13 @@ void R_Mesh_PrepareVertices_Generic(int numvertices, const r_vertexgeneric_t *ve
 		if (vertexbuffer)
 		{
 			R_Mesh_VertexPointer(     3, GL_FLOAT        , sizeof(*vertex), vertex->vertex3f          , vertexbuffer, (int)((unsigned char *)vertex->vertex3f           - (unsigned char *)vertex));
-			R_Mesh_ColorPointer(      4, GL_UNSIGNED_BYTE, sizeof(*vertex), vertex->color4ub          , vertexbuffer, (int)((unsigned char *)vertex->color4ub           - (unsigned char *)vertex));
+			R_Mesh_ColorPointer(      4, GL_FLOAT        , sizeof(*vertex), vertex->color4f           , vertexbuffer, (int)((unsigned char *)vertex->color4f            - (unsigned char *)vertex));
 			R_Mesh_TexCoordPointer(0, 2, GL_FLOAT        , sizeof(*vertex), vertex->texcoord2f        , vertexbuffer, (int)((unsigned char *)vertex->texcoord2f         - (unsigned char *)vertex));
 		}
 		else
 		{
 			R_Mesh_VertexPointer(     3, GL_FLOAT        , sizeof(*vertex), vertex->vertex3f          , NULL, 0);
-			R_Mesh_ColorPointer(      4, GL_UNSIGNED_BYTE, sizeof(*vertex), vertex->color4ub          , NULL, 0);
+			R_Mesh_ColorPointer(      4, GL_FLOAT        , sizeof(*vertex), vertex->color4f           , NULL, 0);
 			R_Mesh_TexCoordPointer(0, 2, GL_FLOAT        , sizeof(*vertex), vertex->texcoord2f        , NULL, 0);
 		}
 		break;
@@ -4273,7 +4162,7 @@ void R_Mesh_PrepareVertices_Generic(int numvertices, const r_vertexgeneric_t *ve
 		break;
 	case RENDERPATH_SOFT:
 		DPSOFTRAST_SetVertexPointer(vertex->vertex3f, sizeof(*vertex));
-		DPSOFTRAST_SetColorPointer4ub(vertex->color4ub, sizeof(*vertex));
+		DPSOFTRAST_SetColorPointer(vertex->color4f, sizeof(*vertex));
 		DPSOFTRAST_SetTexCoordPointer(0, 2, sizeof(*vertex), vertex->texcoord2f);
 		DPSOFTRAST_SetTexCoordPointer(1, 2, sizeof(*vertex), NULL);
 		DPSOFTRAST_SetTexCoordPointer(2, 2, sizeof(*vertex), NULL);
@@ -4314,7 +4203,6 @@ void R_Mesh_PrepareVertices_Mesh_Arrays(int numvertices, const float *vertex3f,
 	switch(vid.renderpath)
 	{
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 	case RENDERPATH_GLES2:
 		if (!vid.useinterleavedarrays)
 		{
@@ -4328,8 +4216,9 @@ void R_Mesh_PrepareVertices_Mesh_Arrays(int numvertices, const float *vertex3f,
 			return;
 		}
 		break;
-	case RENDERPATH_GL13:
 	case RENDERPATH_GL11:
+	case RENDERPATH_GL13:
+	case RENDERPATH_GLES1:
 		if (!vid.useinterleavedarrays)
 		{
 			R_Mesh_VertexPointer(3, GL_FLOAT, sizeof(float[3]), vertex3f, NULL, 0);
@@ -4372,19 +4261,12 @@ void R_Mesh_PrepareVertices_Mesh_Arrays(int numvertices, const float *vertex3f,
 	if (color4f)
 	{
 		for (i = 0;i < numvertices;i++)
-			Vector4Scale(color4f + 4*i, 255.0f, vertex[i].color4ub);
+			Vector4Copy(color4f + 4*i, vertex[i].color4f);
 	}
 	else
 	{
-		float tempcolor4f[4];
-		unsigned char tempcolor4ub[4];
-		Vector4Scale(gl_state.color4f, 255.0f, tempcolor4f);
-		tempcolor4ub[0] = (unsigned char)bound(0.0f, tempcolor4f[0], 255.0f);
-		tempcolor4ub[1] = (unsigned char)bound(0.0f, tempcolor4f[1], 255.0f);
-		tempcolor4ub[2] = (unsigned char)bound(0.0f, tempcolor4f[2], 255.0f);
-		tempcolor4ub[3] = (unsigned char)bound(0.0f, tempcolor4f[3], 255.0f);
 		for (i = 0;i < numvertices;i++)
-			Vector4Copy(tempcolor4ub, vertex[i].color4ub);
+			Vector4Copy(gl_state.color4f, vertex[i].color4f);
 	}
 	if (texcoordtexture2f)
 		for (i = 0;i < numvertices;i++)
@@ -4412,12 +4294,11 @@ void R_Mesh_PrepareVertices_Mesh(int numvertices, const r_vertexmesh_t *vertex,
 	switch(vid.renderpath)
 	{
 	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
 	case RENDERPATH_GLES2:
 		if (vertexbuffer)
 		{
 			R_Mesh_VertexPointer(     3, GL_FLOAT        , sizeof(*vertex), vertex->vertex3f          , vertexbuffer, (int)((unsigned char *)vertex->vertex3f           - (unsigned char *)vertex));
-			R_Mesh_ColorPointer(      4, GL_UNSIGNED_BYTE, sizeof(*vertex), vertex->color4ub          , vertexbuffer, (int)((unsigned char *)vertex->color4ub           - (unsigned char *)vertex));
+			R_Mesh_ColorPointer(      4, GL_FLOAT        , sizeof(*vertex), vertex->color4f           , vertexbuffer, (int)((unsigned char *)vertex->color4f            - (unsigned char *)vertex));
 			R_Mesh_TexCoordPointer(0, 2, GL_FLOAT        , sizeof(*vertex), vertex->texcoordtexture2f , vertexbuffer, (int)((unsigned char *)vertex->texcoordtexture2f  - (unsigned char *)vertex));
 			R_Mesh_TexCoordPointer(1, 3, GL_FLOAT        , sizeof(*vertex), vertex->svector3f         , vertexbuffer, (int)((unsigned char *)vertex->svector3f          - (unsigned char *)vertex));
 			R_Mesh_TexCoordPointer(2, 3, GL_FLOAT        , sizeof(*vertex), vertex->tvector3f         , vertexbuffer, (int)((unsigned char *)vertex->tvector3f          - (unsigned char *)vertex));
@@ -4427,7 +4308,7 @@ void R_Mesh_PrepareVertices_Mesh(int numvertices, const r_vertexmesh_t *vertex,
 		else
 		{
 			R_Mesh_VertexPointer(     3, GL_FLOAT        , sizeof(*vertex), vertex->vertex3f          , NULL, 0);
-			R_Mesh_ColorPointer(      4, GL_UNSIGNED_BYTE, sizeof(*vertex), vertex->color4ub          , NULL, 0);
+			R_Mesh_ColorPointer(      4, GL_FLOAT        , sizeof(*vertex), vertex->color4f           , NULL, 0);
 			R_Mesh_TexCoordPointer(0, 2, GL_FLOAT        , sizeof(*vertex), vertex->texcoordtexture2f , NULL, 0);
 			R_Mesh_TexCoordPointer(1, 3, GL_FLOAT        , sizeof(*vertex), vertex->svector3f         , NULL, 0);
 			R_Mesh_TexCoordPointer(2, 3, GL_FLOAT        , sizeof(*vertex), vertex->tvector3f         , NULL, 0);
@@ -4436,17 +4317,18 @@ void R_Mesh_PrepareVertices_Mesh(int numvertices, const r_vertexmesh_t *vertex,
 		}
 		break;
 	case RENDERPATH_GL13:
+	case RENDERPATH_GLES1:
 		if (vertexbuffer)
 		{
 			R_Mesh_VertexPointer(     3, GL_FLOAT        , sizeof(*vertex), vertex->vertex3f          , vertexbuffer, (int)((unsigned char *)vertex->vertex3f           - (unsigned char *)vertex));
-			R_Mesh_ColorPointer(      4, GL_UNSIGNED_BYTE, sizeof(*vertex), vertex->color4ub          , vertexbuffer, (int)((unsigned char *)vertex->color4ub           - (unsigned char *)vertex));
+			R_Mesh_ColorPointer(      4, GL_FLOAT        , sizeof(*vertex), vertex->color4f           , vertexbuffer, (int)((unsigned char *)vertex->color4f            - (unsigned char *)vertex));
 			R_Mesh_TexCoordPointer(0, 2, GL_FLOAT        , sizeof(*vertex), vertex->texcoordtexture2f , vertexbuffer, (int)((unsigned char *)vertex->texcoordtexture2f  - (unsigned char *)vertex));
 			R_Mesh_TexCoordPointer(1, 2, GL_FLOAT        , sizeof(*vertex), vertex->texcoordlightmap2f, vertexbuffer, (int)((unsigned char *)vertex->texcoordlightmap2f - (unsigned char *)vertex));
 		}
 		else
 		{
 			R_Mesh_VertexPointer(     3, GL_FLOAT        , sizeof(*vertex), vertex->vertex3f          , NULL, 0);
-			R_Mesh_ColorPointer(      4, GL_UNSIGNED_BYTE, sizeof(*vertex), vertex->color4ub          , NULL, 0);
+			R_Mesh_ColorPointer(      4, GL_FLOAT        , sizeof(*vertex), vertex->color4f           , NULL, 0);
 			R_Mesh_TexCoordPointer(0, 2, GL_FLOAT        , sizeof(*vertex), vertex->texcoordtexture2f , NULL, 0);
 			R_Mesh_TexCoordPointer(1, 2, GL_FLOAT        , sizeof(*vertex), vertex->texcoordlightmap2f, NULL, 0);
 		}
@@ -4455,13 +4337,13 @@ void R_Mesh_PrepareVertices_Mesh(int numvertices, const r_vertexmesh_t *vertex,
 		if (vertexbuffer)
 		{
 			R_Mesh_VertexPointer(     3, GL_FLOAT        , sizeof(*vertex), vertex->vertex3f          , vertexbuffer, (int)((unsigned char *)vertex->vertex3f           - (unsigned char *)vertex));
-			R_Mesh_ColorPointer(      4, GL_UNSIGNED_BYTE, sizeof(*vertex), vertex->color4ub          , vertexbuffer, (int)((unsigned char *)vertex->color4ub           - (unsigned char *)vertex));
+			R_Mesh_ColorPointer(      4, GL_FLOAT        , sizeof(*vertex), vertex->color4f           , vertexbuffer, (int)((unsigned char *)vertex->color4f            - (unsigned char *)vertex));
 			R_Mesh_TexCoordPointer(0, 2, GL_FLOAT        , sizeof(*vertex), vertex->texcoordtexture2f , vertexbuffer, (int)((unsigned char *)vertex->texcoordtexture2f  - (unsigned char *)vertex));
 		}
 		else
 		{
 			R_Mesh_VertexPointer(     3, GL_FLOAT        , sizeof(*vertex), vertex->vertex3f          , NULL, 0);
-			R_Mesh_ColorPointer(      4, GL_UNSIGNED_BYTE, sizeof(*vertex), vertex->color4ub          , NULL, 0);
+			R_Mesh_ColorPointer(      4, GL_FLOAT        , sizeof(*vertex), vertex->color4f           , NULL, 0);
 			R_Mesh_TexCoordPointer(0, 2, GL_FLOAT        , sizeof(*vertex), vertex->texcoordtexture2f , NULL, 0);
 		}
 		break;
@@ -4485,7 +4367,7 @@ void R_Mesh_PrepareVertices_Mesh(int numvertices, const r_vertexmesh_t *vertex,
 		break;
 	case RENDERPATH_SOFT:
 		DPSOFTRAST_SetVertexPointer(vertex->vertex3f, sizeof(*vertex));
-		DPSOFTRAST_SetColorPointer4ub(vertex->color4ub, sizeof(*vertex));
+		DPSOFTRAST_SetColorPointer(vertex->color4f, sizeof(*vertex));
 		DPSOFTRAST_SetTexCoordPointer(0, 2, sizeof(*vertex), vertex->texcoordtexture2f);
 		DPSOFTRAST_SetTexCoordPointer(1, 3, sizeof(*vertex), vertex->svector3f);
 		DPSOFTRAST_SetTexCoordPointer(2, 3, sizeof(*vertex), vertex->tvector3f);