fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 04:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Corrected a problem with the sizes of the MAP[12]_* enums.

Browse source
This commit is contained in:
Ian Romanick 2004-12-01 23:53:43 +00:00
parent 5ee2f9aed4
commit 00d153eb72
2 changed files with 19 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/glx/x11/indirect_size.c
View file

@ -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 )

36
src/mesa/glapi/gl_API.xml
View file

@ -326,108 +326,72 @@
<enum name="MAP1_COLOR_4" value="0x0D90">
<size name="Map1d" count="4"/>
<size name="Map1f" count="4"/>
<size name="Map2d" count="4"/>
<size name="Map2f" count="4"/>
</enum>
<enum name="MAP1_INDEX" value="0x0D91">
<size name="Map1d" count="1"/>
<size name="Map1f" count="1"/>
<size name="Map2d" count="1"/>
<size name="Map2f" count="1"/>
</enum>
<enum name="MAP1_NORMAL" value="0x0D92">
<size name="Map1d" count="3"/>
<size name="Map1f" count="3"/>
<size name="Map2d" count="3"/>
<size name="Map2f" count="3"/>
</enum>
<enum name="MAP1_TEXTURE_COORD_1" value="0x0D93">
<size name="Map1d" count="1"/>
<size name="Map1f" count="1"/>
<size name="Map2d" count="1"/>
<size name="Map2f" count="1"/>
</enum>
<enum name="MAP1_TEXTURE_COORD_2" value="0x0D94">
<size name="Map1d" count="2"/>
<size name="Map1f" count="2"/>
<size name="Map2d" count="2"/>
<size name="Map2f" count="2"/>
</enum>
<enum name="MAP1_TEXTURE_COORD_3" value="0x0D95">
<size name="Map1d" count="3"/>
<size name="Map1f" count="3"/>
<size name="Map2d" count="3"/>
<size name="Map2f" count="3"/>
</enum>
<enum name="MAP1_TEXTURE_COORD_4" value="0x0D96">
<size name="Map1d" count="4"/>
<size name="Map1f" count="4"/>
<size name="Map2d" count="4"/>
<size name="Map2f" count="4"/>
</enum>
<enum name="MAP1_VERTEX_3" value="0x0D97">
<size name="Map1d" count="3"/>
<size name="Map1f" count="3"/>
<size name="Map2d" count="3"/>
<size name="Map2f" count="3"/>
</enum>
<enum name="MAP1_VERTEX_4" value="0x0D98">
<size name="Map1d" count="4"/>
<size name="Map1f" count="4"/>
<size name="Map2d" count="4"/>
<size name="Map2f" count="4"/>
</enum>
<enum name="MAP2_COLOR_4" value="0x0DB0">
<size name="Map1d" count="4"/>
<size name="Map1f" count="4"/>
<size name="Map2d" count="4"/>
<size name="Map2f" count="4"/>
</enum>
<enum name="MAP2_INDEX" value="0x0DB1">
<size name="Map1d" count="1"/>
<size name="Map1f" count="1"/>
<size name="Map2d" count="1"/>
<size name="Map2f" count="1"/>
</enum>
<enum name="MAP2_NORMAL" value="0x0DB2">
<size name="Map1d" count="3"/>
<size name="Map1f" count="3"/>
<size name="Map2d" count="3"/>
<size name="Map2f" count="3"/>
</enum>
<enum name="MAP2_TEXTURE_COORD_1" value="0x0DB3">
<size name="Map1d" count="1"/>
<size name="Map1f" count="1"/>
<size name="Map2d" count="1"/>
<size name="Map2f" count="1"/>
</enum>
<enum name="MAP2_TEXTURE_COORD_2" value="0x0DB4">
<size name="Map1d" count="2"/>
<size name="Map1f" count="2"/>
<size name="Map2d" count="2"/>
<size name="Map2f" count="2"/>
</enum>
<enum name="MAP2_TEXTURE_COORD_3" value="0x0DB5">
<size name="Map1d" count="3"/>
<size name="Map1f" count="3"/>
<size name="Map2d" count="3"/>
<size name="Map2f" count="3"/>
</enum>
<enum name="MAP2_TEXTURE_COORD_4" value="0x0DB6">
<size name="Map1d" count="4"/>
<size name="Map1f" count="4"/>
<size name="Map2d" count="4"/>
<size name="Map2f" count="4"/>
</enum>
<enum name="MAP2_VERTEX_3" value="0x0DB7">
<size name="Map1d" count="3"/>
<size name="Map1f" count="3"/>
<size name="Map2d" count="3"/>
<size name="Map2f" count="3"/>
</enum>
<enum name="MAP2_VERTEX_4" value="0x0DB8">
<size name="Map1d" count="4"/>
<size name="Map1f" count="4"/>
<size name="Map2d" count="4"/>
<size name="Map2f" count="4"/>
</enum>