From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 1 Feb 2008 05:51:21 +0000 (+0000)
Subject: reassigned some GL20TU values to use only 11 texture slots
X-Git-Tag: xonotic-v0.1.0preview~2456
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c2abad5db0c64852d4e807fac9d247ac220891c1;p=xonotic%2Fdarkplaces.git

reassigned some GL20TU values to use only 11 texture slots


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

diff --git a/render.h b/render.h
index bd3cd1bf..ff6258b7 100644
--- a/render.h
+++ b/render.h
@@ -365,26 +365,38 @@ rsurfacepass_t;
 
 typedef enum gl20_texunit_e
 {
+	// postprocess shaders, and generic shaders:
 	GL20TU_FIRST = 0,
 	GL20TU_SECOND = 1,
 	GL20TU_GAMMARAMPS = 2,
+	// standard material properties
 	GL20TU_NORMAL = 0,
 	GL20TU_COLOR = 1,
 	GL20TU_GLOSS = 2,
 	GL20TU_GLOW = 3,
+	// material properties for a second material
 	GL20TU_SECONDARY_NORMAL = 4,
 	GL20TU_SECONDARY_COLOR = 5,
 	GL20TU_SECONDARY_GLOSS = 6,
 	GL20TU_SECONDARY_GLOW = 7,
-	GL20TU_PANTS = 8,
-	GL20TU_SHIRT = 9,
-	GL20TU_FOGMASK = 10,
-	GL20TU_LIGHTMAP = 11,
-	GL20TU_DELUXEMAP = 12,
-	GL20TU_REFRACTION = 13,
-	GL20TU_REFLECTION = 14,
-	GL20TU_ATTENUATION = 3,
-	GL20TU_CUBE = 13,
+	// material properties for a colormapped material
+	// conflicts with secondary material
+	GL20TU_PANTS = 4,
+	GL20TU_SHIRT = 5,
+	// fog fade in the distance
+	GL20TU_FOGMASK = 8,
+	// compiled ambient lightmap and deluxemap
+	GL20TU_LIGHTMAP = 9,
+	GL20TU_DELUXEMAP = 10,
+	// refraction, used by water shaders
+	GL20TU_REFRACTION = 3,
+	// reflection, used by water shaders, also with normal material rendering
+	// conflicts with secondary material
+	GL20TU_REFLECTION = 7,
+	// rtlight attenuation (distance fade) and cubemap filter (projection texturing)
+	// conflicts with lightmap/deluxemap
+	GL20TU_ATTENUATION = 9,
+	GL20TU_CUBE = 10,
 }
 gl20_texunit;