diff options
| author | Ian Romanick <idr@us.ibm.com> | 2005-01-28 17:58:58 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2005-01-28 17:58:58 +0000 |
| commit | 20b8d9c1b927f30390093750af0f4008adbfa5cf (patch) | |
| tree | 22982182c7d5a5f0b36eb78e6454cbea1138d1b5 /src | |
| parent | fdb0527ddce8eb2927631d4fbf38e6625b0af8b1 (diff) | |
Fix some get / set errors with COLOR_TABLE_*. SCALE and BIAS can be
parameters to GetColorTableParameter[if]v. FORMAT, WIDTH, and the SIZE
enums cannot be parameters to ColorTableParameter[if]v.
Diffstat (limited to 'src')
| -rw-r--r-- | src/glx/x11/indirect_size.c | 9 | ||||
| -rw-r--r-- | src/mesa/glapi/gl_API.xml | 36 |
2 files changed, 20 insertions, 25 deletions
diff --git a/src/glx/x11/indirect_size.c b/src/glx/x11/indirect_size.c index ae2b14c6c3..c21e1ee086 100644 --- a/src/glx/x11/indirect_size.c +++ b/src/glx/x11/indirect_size.c @@ -302,15 +302,6 @@ INTERNAL PURE FASTCALL GLint __glColorTableParameterfv_size( GLenum e ) { switch( e ) { - case GL_COLOR_TABLE_FORMAT: - case GL_COLOR_TABLE_WIDTH: - case GL_COLOR_TABLE_RED_SIZE: - case GL_COLOR_TABLE_GREEN_SIZE: - case GL_COLOR_TABLE_BLUE_SIZE: - case GL_COLOR_TABLE_ALPHA_SIZE: - case GL_COLOR_TABLE_LUMINANCE_SIZE: - case GL_COLOR_TABLE_INTENSITY_SIZE: - return 1; case GL_COLOR_TABLE_SCALE: case GL_COLOR_TABLE_BIAS: return 4; diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml index d3c4d81684..f76e355e52 100644 --- a/src/mesa/glapi/gl_API.xml +++ b/src/mesa/glapi/gl_API.xml @@ -3202,42 +3202,46 @@ glx: <enum name="COLOR_TABLE_SCALE" count="4" value="0x80D6"> <size name="ColorTableParameterfv"/> <size name="ColorTableParameteriv"/> + <size name="GetColorTableParameterfv" mode="get"/> + <size name="GetColorTableParameteriv" mode="get"/> </enum> <enum name="COLOR_TABLE_BIAS" count="4" value="0x80D7"> <size name="ColorTableParameterfv"/> <size name="ColorTableParameteriv"/> + <size name="GetColorTableParameterfv" mode="get"/> + <size name="GetColorTableParameteriv" mode="get"/> </enum> <enum name="COLOR_TABLE_FORMAT" count="1" value="0x80D8"> - <size name="ColorTableParameterfv"/> - <size name="ColorTableParameteriv"/> + <size name="GetColorTableParameterfv" mode="get"/> + <size name="GetColorTableParameteriv" mode="get"/> </enum> <enum name="COLOR_TABLE_WIDTH" count="1" value="0x80D9"> - <size name="ColorTableParameterfv"/> - <size name="ColorTableParameteriv"/> + <size name="GetColorTableParameterfv" mode="get"/> + <size name="GetColorTableParameteriv" mode="get"/> </enum> <enum name="COLOR_TABLE_RED_SIZE" count="1" value="0x80DA"> - <size name="ColorTableParameterfv"/> - <size name="ColorTableParameteriv"/> + <size name="GetColorTableParameterfv" mode="get"/> + <size name="GetColorTableParameteriv" mode="get"/> </enum> <enum name="COLOR_TABLE_GREEN_SIZE" count="1" value="0x80DB"> - <size name="ColorTableParameterfv"/> - <size name="ColorTableParameteriv"/> + <size name="GetColorTableParameterfv" mode="get"/> + <size name="GetColorTableParameteriv" mode="get"/> </enum> <enum name="COLOR_TABLE_BLUE_SIZE" count="1" value="0x80DC"> - <size name="ColorTableParameterfv"/> - <size name="ColorTableParameteriv"/> + <size name="GetColorTableParameterfv" mode="get"/> + <size name="GetColorTableParameteriv" mode="get"/> </enum> <enum name="COLOR_TABLE_ALPHA_SIZE" count="1" value="0x80DD"> - <size name="ColorTableParameterfv"/> - <size name="ColorTableParameteriv"/> + <size name="GetColorTableParameterfv" mode="get"/> + <size name="GetColorTableParameteriv" mode="get"/> </enum> <enum name="COLOR_TABLE_LUMINANCE_SIZE" count="1" value="0x80DE"> - <size name="ColorTableParameterfv"/> - <size name="ColorTableParameteriv"/> + <size name="GetColorTableParameterfv" mode="get"/> + <size name="GetColorTableParameteriv" mode="get"/> </enum> <enum name="COLOR_TABLE_INTENSITY_SIZE" count="1" value="0x80DF"> - <size name="ColorTableParameterfv"/> - <size name="ColorTableParameteriv"/> + <size name="GetColorTableParameterfv" mode="get"/> + <size name="GetColorTableParameteriv" mode="get"/> </enum> |