diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2004-01-27 16:34:45 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2004-01-27 16:34:45 +0000 |
| commit | 18fa367ac6e035341f5eb86ecc4231124b2921e3 (patch) | |
| tree | e0902aabb61e55a785e8742aa809f53dcf5fa16c /src/mesa/main/mtypes.h | |
| parent | 740f7de085f143b2bb1fe623d68c5efb3560e1a7 (diff) | |
Consolidate texObj->Pos/Neg/X/Y/Z and texObj->Image into a single
array, texObj->Image[face][level].
Diffstat (limited to 'src/mesa/main/mtypes.h')
| -rw-r--r-- | src/mesa/main/mtypes.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 815f352701..5e6777efec 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1061,6 +1061,13 @@ struct gl_texture_image { /*@}*/ }; +#define FACE_POS_X 0 +#define FACE_NEG_X 1 +#define FACE_POS_Y 2 +#define FACE_NEG_Y 3 +#define FACE_POS_Z 4 +#define FACE_NEG_Z 5 +#define MAX_FACES 6 /** * Texture object record @@ -1099,20 +1106,7 @@ struct gl_texture_object { GLboolean GenerateMipmap; /**< GL_SGIS_generate_mipmap */ GLboolean _IsPowerOfTwo; /**< Are all image dimensions powers of two? */ - struct gl_texture_image *Image[MAX_TEXTURE_LEVELS]; - - /** - * \name Texture cube faces - * - * Image[] is alias for *PosX[MAX_TEXTURE_LEVELS]; - */ - /*@{*/ - struct gl_texture_image *NegX[MAX_TEXTURE_LEVELS]; - struct gl_texture_image *PosY[MAX_TEXTURE_LEVELS]; - struct gl_texture_image *NegY[MAX_TEXTURE_LEVELS]; - struct gl_texture_image *PosZ[MAX_TEXTURE_LEVELS]; - struct gl_texture_image *NegZ[MAX_TEXTURE_LEVELS]; - /*@}*/ + struct gl_texture_image *Image[MAX_FACES][MAX_TEXTURE_LEVELS]; /** GL_EXT_paletted_texture */ struct gl_color_table Palette; |