diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-07-04 10:37:07 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-07-04 10:37:07 -0600 |
| commit | 0bc2409e3808df54bf7d228475320e2ec4fe80a1 (patch) | |
| tree | 216fbb991b29036bc6ee705e293e9307b96b1172 /src/mesa/main/mtypes.h | |
| parent | a3de65659cf07420363c91ae38dd61468f122ef0 (diff) | |
| download | external_mesa3d-0bc2409e3808df54bf7d228475320e2ec4fe80a1.zip external_mesa3d-0bc2409e3808df54bf7d228475320e2ec4fe80a1.tar.gz external_mesa3d-0bc2409e3808df54bf7d228475320e2ec4fe80a1.tar.bz2 | |
mesa: Replace Proxy1D/2D/etc with ProxyTex[] indexed by TEXTURE_x_INDEX.
Simplification in colortab.c too.
cherry-picked from master (fe469007037d9d5cdbe1677d8ff7368b276e9e7c)
Diffstat (limited to 'src/mesa/main/mtypes.h')
| -rw-r--r-- | src/mesa/main/mtypes.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index a38ec02..2d6be19 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1579,6 +1579,7 @@ 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; @@ -1586,6 +1587,9 @@ struct gl_texture_attrib struct gl_texture_object *ProxyRect; struct gl_texture_object *Proxy1DArray; struct gl_texture_object *Proxy2DArray; +#else + struct gl_texture_object *ProxyTex[NUM_TEXTURE_TARGETS]; +#endif /** GL_EXT_shared_texture_palette */ GLboolean SharedPalette; |