X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_textures.c;h=bae61044d54b531229b3d79dc7bcc1ca2e5066aa;hb=5f35382fe36debde51c7ce98bf72ddd52643d1ca;hp=80fd30aec7fd26d2c95e854aa442174fd66742bc;hpb=ea165f1fabf5482f920308899a606eef655dfa89;p=xonotic%2Fdarkplaces.git

diff --git a/gl_textures.c b/gl_textures.c
index 80fd30ae..bae61044 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -351,7 +351,7 @@ void R_FreeTexture(rtexture_t *rt)
 
 	switch(vid.renderpath)
 	{
-	case RENDERPATH_GL20:
+	case RENDERPATH_GL32:
 	case RENDERPATH_GLES2:
 		if (glt->texnum)
 		{
@@ -461,7 +461,7 @@ static void GL_TextureMode_f (void)
 
 	switch(vid.renderpath)
 	{
-	case RENDERPATH_GL20:
+	case RENDERPATH_GL32:
 	case RENDERPATH_GLES2:
 		// change all the existing mipmap texture objects
 		// FIXME: force renderer(/client/something?) restart instead?
@@ -620,7 +620,7 @@ static void r_textures_start(void)
 {
 	switch(vid.renderpath)
 	{
-	case RENDERPATH_GL20:
+	case RENDERPATH_GL32:
 	case RENDERPATH_GLES2:
 		// LordHavoc: allow any alignment
 		CHECKGLERROR
@@ -675,7 +675,7 @@ static void r_textures_devicelost(void)
 			continue;
 		switch(vid.renderpath)
 		{
-		case RENDERPATH_GL20:
+		case RENDERPATH_GL32:
 		case RENDERPATH_GLES2:
 			break;
 		}
@@ -694,7 +694,7 @@ static void r_textures_devicerestored(void)
 			continue;
 		switch(vid.renderpath)
 		{
-		case RENDERPATH_GL20:
+		case RENDERPATH_GL32:
 		case RENDERPATH_GLES2:
 			break;
 		}
@@ -772,7 +772,7 @@ void R_Textures_Frame (void)
 
 		switch(vid.renderpath)
 		{
-		case RENDERPATH_GL20:
+		case RENDERPATH_GL32:
 		case RENDERPATH_GLES2:
 			// ignore the first difference, any textures loaded by now probably had the same aniso value
 			if (first_time_aniso)
@@ -897,13 +897,11 @@ static void GL_SetupTextureParameters(int flags, textype_t textype, int texturet
 	case TEXTYPE_SHADOWMAP24_COMP:
 		qglTexParameteri(textureenum, GL_TEXTURE_COMPARE_MODE_ARB, GL_COMPARE_R_TO_TEXTURE_ARB);CHECKGLERROR
 		qglTexParameteri(textureenum, GL_TEXTURE_COMPARE_FUNC_ARB, GL_LEQUAL);CHECKGLERROR
-		qglTexParameteri(textureenum, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE);CHECKGLERROR
 		break;
 	case TEXTYPE_SHADOWMAP16_RAW:
 	case TEXTYPE_SHADOWMAP24_RAW:
 		qglTexParameteri(textureenum, GL_TEXTURE_COMPARE_MODE_ARB, GL_NONE);CHECKGLERROR
 		qglTexParameteri(textureenum, GL_TEXTURE_COMPARE_FUNC_ARB, GL_LEQUAL);CHECKGLERROR
-		qglTexParameteri(textureenum, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE);CHECKGLERROR
 		break;
 	default:
 		break;
@@ -934,7 +932,7 @@ static void R_UploadPartialTexture(gltexture_t *glt, const unsigned char *data,
 
 	switch(vid.renderpath)
 	{
-	case RENDERPATH_GL20:
+	case RENDERPATH_GL32:
 	case RENDERPATH_GLES2:
 		{
 			int oldbindtexnum;
@@ -1020,7 +1018,7 @@ static void R_UploadFullTexture(gltexture_t *glt, const unsigned char *data)
 	// do the appropriate upload type...
 	switch(vid.renderpath)
 	{
-	case RENDERPATH_GL20:
+	case RENDERPATH_GL32:
 	case RENDERPATH_GLES2:
 		if (glt->texnum) // not renderbuffers
 		{
@@ -1316,7 +1314,7 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden
 	// data may be NULL (blank texture for dynamic rendering)
 	switch(vid.renderpath)
 	{
-	case RENDERPATH_GL20:
+	case RENDERPATH_GL32:
 	case RENDERPATH_GLES2:
 		CHECKGLERROR
 		qglGenTextures(1, (GLuint *)&glt->texnum);CHECKGLERROR
@@ -1403,7 +1401,7 @@ rtexture_t *R_LoadTextureRenderBuffer(rtexturepool_t *rtexturepool, const char *
 	// data may be NULL (blank texture for dynamic rendering)
 	switch(vid.renderpath)
 	{
-	case RENDERPATH_GL20:
+	case RENDERPATH_GL32:
 	case RENDERPATH_GLES2:
 		CHECKGLERROR
 		qglGenRenderbuffers(1, (GLuint *)&glt->renderbuffernum);CHECKGLERROR
@@ -2181,7 +2179,7 @@ rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filen
 	// create the texture object
 	switch(vid.renderpath)
 	{
-	case RENDERPATH_GL20:
+	case RENDERPATH_GL32:
 	case RENDERPATH_GLES2:
 		CHECKGLERROR
 		GL_ActiveTexture(0);
@@ -2205,7 +2203,7 @@ rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filen
 			break;
 		switch(vid.renderpath)
 		{
-		case RENDERPATH_GL20:
+		case RENDERPATH_GL32:
 		case RENDERPATH_GLES2:
 			if (bytesperblock)
 			{
@@ -2234,7 +2232,7 @@ rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filen
 	// after upload we have to set some parameters...
 	switch(vid.renderpath)
 	{
-	case RENDERPATH_GL20:
+	case RENDERPATH_GL32:
 	case RENDERPATH_GLES2:
 #ifdef GL_TEXTURE_MAX_LEVEL
 		if (dds_miplevels >= 1 && !mipcomplete)