summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-08-16 11:06:39 +0100
committerBrian <brian.paul@tungstengraphics.com>2007-08-16 11:06:39 +0100
commit09867b53a9add9c1a392ad46f850d40d50bbc536 (patch)
tree8e27d87c9a944cf2e8e52322fdb1a5fb2354c111
parentfe469007037d9d5cdbe1677d8ff7368b276e9e7c (diff)
replace Proxy1D/2D/etc fields with ProxyTex[] array
-rw-r--r--src/mesa/main/mtypes.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index a04815a021c..1145f361b13 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1576,17 +1576,8 @@ struct gl_texture_attrib
struct gl_texture_unit Unit[MAX_TEXTURE_UNITS];
-#if 0
- struct gl_texture_object *Proxy1D;
- struct gl_texture_object *Proxy2D;
- struct gl_texture_object *Proxy3D;
- struct gl_texture_object *ProxyCubeMap;
- struct gl_texture_object *ProxyRect;
- struct gl_texture_object *Proxy1DArray;
- struct gl_texture_object *Proxy2DArray;
-#else
+ /** Proxy texture objects */
struct gl_texture_object *ProxyTex[NUM_TEXTURE_TARGETS];
-#endif
/** GL_EXT_shared_texture_palette */
GLboolean SharedPalette;