From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 12 Jan 2004 03:54:29 +0000 (+0000)
Subject: don't try to upload distorttextures if the texture shader extension is missing
X-Git-Tag: xonotic-v0.1.0preview~6162
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=90e103b9a849d31939ae99d6914f38dbe2345498

don't try to upload distorttextures if the texture shader extension is missing


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3803 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/model_shared.c b/model_shared.c
index 28841924..766ab18f 100644
--- a/model_shared.c
+++ b/model_shared.c
@@ -112,19 +112,24 @@ void Mod_BuildDistortTexture (void)
 		}
 	}
 
+
 	for (i=0; i<4; i++)
 	{
 		for (j=0; j<16; j++)
 		{
-			for (y=0; y<DISTORTRESOLUTION; y++)
+			mod_shared_distorttexture[i*16+j] = NULL;
+			if (gl_textureshader)
 			{
-				for (x=0; x<DISTORTRESOLUTION; x++)
+				for (y=0; y<DISTORTRESOLUTION; y++)
 				{
-					data[4][y][x][0] = Mod_MorphDistortTexture (data[(i-1)&3][y][x][0], data[i][y][x][0], data[(i+1)&3][y][x][0], data[(i+2)&3][y][x][0], 0.0625*j);
-					data[4][y][x][1] = Mod_MorphDistortTexture (data[(i-1)&3][y][x][1], data[i][y][x][1], data[(i+1)&3][y][x][1], data[(i+2)&3][y][x][1], 0.0625*j);
+					for (x=0; x<DISTORTRESOLUTION; x++)
+					{
+						data[4][y][x][0] = Mod_MorphDistortTexture (data[(i-1)&3][y][x][0], data[i][y][x][0], data[(i+1)&3][y][x][0], data[(i+2)&3][y][x][0], 0.0625*j);
+						data[4][y][x][1] = Mod_MorphDistortTexture (data[(i-1)&3][y][x][1], data[i][y][x][1], data[(i+1)&3][y][x][1], data[(i+2)&3][y][x][1], 0.0625*j);
+					}
 				}
+				mod_shared_distorttexture[i*16+j] = R_LoadTexture2D(mod_shared_texturepool, va("distorttexture%i", i*16+j), DISTORTRESOLUTION, DISTORTRESOLUTION, &data[4][0][0][0], TEXTYPE_DSDT, TEXF_PRECACHE, NULL);
 			}
-			mod_shared_distorttexture[i*16+j] = R_LoadTexture2D(mod_shared_texturepool, va("distorttexture%i", i*16+j), DISTORTRESOLUTION, DISTORTRESOLUTION, &data[4][0][0][0], TEXTYPE_DSDT, TEXF_PRECACHE, NULL);
 		}
 	}