diff options
| author | Ian Romanick <idr@us.ibm.com> | 2004-12-01 23:53:43 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2004-12-01 23:53:43 +0000 |
| commit | 00d153eb726b6869ad9aa6a099c5ce31013d5535 (patch) | |
| tree | 59b3b8036a64a9ded4cff6ad950d9e9346b617e7 /src/glx | |
| parent | 5ee2f9aed427c28ebab992ff5f97e278e60ab1c6 (diff) | |
Corrected a problem with the sizes of the MAP[12]_* enums.
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/x11/indirect_size.c | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/src/glx/x11/indirect_size.c b/src/glx/x11/indirect_size.c index c9367e53ac..95216b5a75 100644 --- a/src/glx/x11/indirect_size.c +++ b/src/glx/x11/indirect_size.c @@ -256,22 +256,34 @@ __glMap1d_size( GLenum e ) switch( e ) { case GL_MAP1_INDEX: case GL_MAP1_TEXTURE_COORD_1: - case GL_MAP2_INDEX: - case GL_MAP2_TEXTURE_COORD_1: return 1; case GL_MAP1_TEXTURE_COORD_2: - case GL_MAP2_TEXTURE_COORD_2: return 2; case GL_MAP1_NORMAL: case GL_MAP1_TEXTURE_COORD_3: case GL_MAP1_VERTEX_3: - case GL_MAP2_NORMAL: - case GL_MAP2_TEXTURE_COORD_3: - case GL_MAP2_VERTEX_3: return 3; case GL_MAP1_COLOR_4: case GL_MAP1_TEXTURE_COORD_4: case GL_MAP1_VERTEX_4: + return 4; + default: return 0; + } +} + +INTERNAL PURE FASTCALL GLint +__glMap2d_size( GLenum e ) +{ + switch( e ) { + case GL_MAP2_INDEX: + case GL_MAP2_TEXTURE_COORD_1: + return 1; + case GL_MAP2_TEXTURE_COORD_2: + return 2; + case GL_MAP2_NORMAL: + case GL_MAP2_TEXTURE_COORD_3: + case GL_MAP2_VERTEX_3: + return 3; case GL_MAP2_COLOR_4: case GL_MAP2_TEXTURE_COORD_4: case GL_MAP2_VERTEX_4: @@ -350,8 +362,7 @@ ALIAS( TexEnviv, TexEnvfv ) ALIAS( TexGenfv, TexGendv ) ALIAS( TexGeniv, TexGendv ) ALIAS( Map1f, Map1d ) -ALIAS( Map2d, Map1d ) -ALIAS( Map2f, Map1d ) +ALIAS( Map2f, Map2d ) ALIAS( ColorTableParameteriv, ColorTableParameterfv ) ALIAS( ConvolutionParameteriv, ConvolutionParameterfv ) ALIAS( PointParameterivNV, PointParameterfvEXT ) |