diff options
| author | Gareth Hughes <gareth@valinux.com> | 2001-03-28 20:40:51 +0000 |
|---|---|---|
| committer | Gareth Hughes <gareth@valinux.com> | 2001-03-28 20:40:51 +0000 |
| commit | 38f28665bf9fb5b2464738ca5074848ec2777ae1 (patch) | |
| tree | d7df29f52814f6cd466b3ad9c3252c744ee5071c /src/mesa/main/mtypes.h | |
| parent | 53933fe9dbfae168dce0688b406810462a6d577b (diff) | |
More texture format updates. Drivers now need only plug an appropriate
format into texImage->TexFormat, the rest is handled by core Mesa.
Diffstat (limited to 'src/mesa/main/mtypes.h')
| -rw-r--r-- | src/mesa/main/mtypes.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 5aa3619e62..6ecb33d32e 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1,4 +1,4 @@ -/* $Id: mtypes.h,v 1.33 2001/03/27 19:18:02 gareth Exp $ */ +/* $Id: mtypes.h,v 1.34 2001/03/28 20:40:51 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -777,10 +777,10 @@ typedef void (*FetchTexelFunc)( const struct gl_texture_image *texImage, /* Texture format record */ struct gl_texture_format { - GLint IntFormat; /* One of the MESA_FORMAT_* values */ + GLint MesaFormat; /* One of the MESA_FORMAT_* values */ - GLenum BaseFormat; - GLenum BaseType; + GLenum IntFormat; /* Internal format as GL enum value */ + GLenum Type; /* Internal type as GL enum value */ GLubyte RedBits; /* Bits per texel component */ GLubyte GreenBits; @@ -804,8 +804,6 @@ struct gl_texture_image { * GL_INTENSITY, GL_RGB, GL_RGBA, * GL_COLOR_INDEX or GL_DEPTH_COMPONENT only. */ - GLenum Type; /* Texel type: GL_UNSIGNED_BYTE, etc. */ - GLenum IntFormat; /* Internal format as given by the user */ GLuint Border; /* 0 or 1 */ GLuint Width; /* = 2^WidthLog2 + 2*Border */ GLuint Height; /* = 2^HeightLog2 + 2*Border */ |