diff options
Diffstat (limited to 'src/mesa/main/mtypes.h')
| -rw-r--r-- | src/mesa/main/mtypes.h | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 83a63bfa11..e345c30a4c 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1,4 +1,4 @@ -/* $Id: mtypes.h,v 1.92 2002/10/02 23:24:04 brianp Exp $ */ +/* $Id: mtypes.h,v 1.93 2002/10/04 19:10:08 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -311,11 +311,7 @@ struct gl_accum_attrib { struct gl_colorbuffer_attrib { GLuint ClearIndex; /* Index to use for glClear */ -#if 1 - GLchan ClearColor[4]; /* Color to use for glClear */ -#else GLclampf ClearColor[4]; /* Color to use for glClear */ -#endif GLuint IndexMask; /* Color index write mask */ GLubyte ColorMask[4]; /* Each flag is 0xff or 0x0 */ @@ -327,11 +323,7 @@ struct gl_colorbuffer_attrib { /* alpha testing */ GLboolean AlphaEnabled; /* Alpha test enabled flag */ GLenum AlphaFunc; /* Alpha test function */ -#if 1 - GLchan AlphaRef; /* Alpha ref value as GLchan */ -#else GLclampf AlphaRef; -#endif /* blending */ GLboolean BlendEnabled; /* Blending enabled flag */ @@ -870,11 +862,8 @@ struct gl_texture_object { GLuint Name; /* an unsigned integer */ GLenum Target; /* GL_TEXTURE_1D, GL_TEXTURE_2D, etc. */ GLfloat Priority; /* in [0,1] */ - GLfloat BorderValues[4]; /* unclamped */ -#if 1 - /* omit someday */ - GLchan BorderColor[4]; /* clamped, as GLchan */ -#endif + GLfloat BorderColor[4]; /* unclamped */ + GLchan _BorderChan[4]; /* clamped, as GLchan */ GLenum WrapS; /* Wrap modes are: GL_CLAMP, REPEAT */ GLenum WrapT; /* GL_CLAMP_TO_EDGE, and */ GLenum WrapR; /* GL_CLAMP_TO_BORDER_ARB */ @@ -887,11 +876,7 @@ struct gl_texture_object { GLfloat MaxAnisotropy; /* GL_EXT_texture_filter_anisotropic */ GLboolean CompareFlag; /* GL_SGIX_shadow */ GLenum CompareOperator; /* GL_SGIX_shadow */ -#if 1 - GLchan ShadowAmbient; /* GL_SGIX/ARB_shadow_ambient */ -#else GLfloat ShadowAmbient; -#endif GLenum CompareMode; /* GL_ARB_shadow */ GLenum CompareFunc; /* GL_ARB_shadow */ GLenum DepthMode; /* GL_ARB_depth_texture */ @@ -1329,17 +1314,11 @@ struct gl_frame_buffer { GLaccum *Accum; /* array [4*Width*Height] of GLaccum values */ /* Software alpha planes */ -#if 1 - GLchan *FrontLeftAlpha; /* array [Width*Height] of GLubyte */ - GLchan *BackLeftAlpha; /* array [Width*Height] of GLubyte */ - GLchan *FrontRightAlpha; /* array [Width*Height] of GLubyte */ - GLchan *BackRightAlpha; /* array [Width*Height] of GLubyte */ -#else GLvoid *FrontLeftAlpha; /* array [Width*Height] of GLubyte */ GLvoid *BackLeftAlpha; /* array [Width*Height] of GLubyte */ GLvoid *FrontRightAlpha; /* array [Width*Height] of GLubyte */ GLvoid *BackRightAlpha; /* array [Width*Height] of GLubyte */ -#endif + /* Drawing bounds: intersection of window size and scissor box */ GLint _Xmin, _Ymin; /* inclusive */ GLint _Xmax, _Ymax; /* exclusive */ |