diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-14 02:20:18 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-14 02:20:18 +0000 |
| commit | ee4e75bd6f768b7210436feeb32b4545ed62e025 (patch) | |
| tree | 2684654e69d43aa244fc6082717523da202aa43e /src/mesa/main/mtypes.h | |
| parent | 1d886a81add08536f18d2453ae38fcac79f0b806 (diff) | |
Replace ctx->Const.MaxTextureUnits w/ ctx->Const.MaxTexture[Coord/Image]Units
in various places.
Note that ctx->Texture.CurrentUnit needs to be tested against Coord/Image
limits when referenced, not just in glActiveTexture().
Diffstat (limited to 'src/mesa/main/mtypes.h')
| -rw-r--r-- | src/mesa/main/mtypes.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index c8831386bb..a78a7d1927 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -634,7 +634,7 @@ struct gl_current_attrib GLfloat RasterColor[4]; /**< Current raster color */ GLfloat RasterSecondaryColor[4]; /**< Current raster secondary color */ GLfloat RasterIndex; /**< Current raster index */ - GLfloat RasterTexCoords[MAX_TEXTURE_UNITS][4];/**< Current raster texcoords */ + GLfloat RasterTexCoords[MAX_TEXTURE_COORD_UNITS][4]; GLboolean RasterPosValid; /**< Raster pos valid flag */ /*@}*/ }; @@ -1048,8 +1048,8 @@ struct gl_point_attrib GLfloat MinSize, MaxSize; /**< GL_EXT_point_parameters */ GLfloat Threshold; /**< GL_EXT_point_parameters */ GLboolean _Attenuated; /**< True if Params != [1, 0, 0] */ - GLboolean PointSprite; /**< GL_NV_point_sprite / GL_NV_point_sprite */ - GLboolean CoordReplace[MAX_TEXTURE_UNITS]; /**< GL_NV/ARB_point_sprite */ + GLboolean PointSprite; /**< GL_NV/ARB_point_sprite */ + GLboolean CoordReplace[MAX_TEXTURE_COORD_UNITS]; /**< GL_ARB_point_sprite */ GLenum SpriteRMode; /**< GL_NV_point_sprite (only!) */ GLenum SpriteOrigin; /**< GL_ARB_point_sprite */ }; |