summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-08-19 01:07:26 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-08-19 01:07:26 +0000
commitd4576154e60d1cc574de15e76fea8fd26c45e230 (patch)
treee1c980ee246f3a51c21be9bf95d0a41efb5215b8
parentbb9387013343261d6a6c58e6a73d6204c6469de6 (diff)
glPixelMap[f/ui/us]v()'s size parameter is GLsizei, not GLint.
-rw-r--r--src/mesa/glapi/APIspec25
-rw-r--r--src/mesa/glapi/glapitable.h6
-rw-r--r--src/mesa/glapi/glapitemp.h6
3 files changed, 27 insertions, 10 deletions
diff --git a/src/mesa/glapi/APIspec b/src/mesa/glapi/APIspec
index eba696346c..8669402898 100644
--- a/src/mesa/glapi/APIspec
+++ b/src/mesa/glapi/APIspec
@@ -1,4 +1,4 @@
-# $Id: APIspec,v 1.18 2003/06/13 02:37:28 brianp Exp $
+# $Id: APIspec,v 1.19 2003/08/19 01:07:26 brianp Exp $
# This file describes all the OpenGL functions.
# We use a number of Python scripts to parse this file and
@@ -1811,7 +1811,7 @@ offset 250
name PixelMapfv
return void
param map GLenum
-param mapsize GLint
+param mapsize GLsizei
param values const GLfloat *
category 1.0
offset 251
@@ -1819,7 +1819,7 @@ offset 251
name PixelMapuiv
return void
param map GLenum
-param mapsize GLint
+param mapsize GLsizei
param values const GLuint *
category 1.0
offset 252
@@ -1827,7 +1827,7 @@ offset 252
name PixelMapusv
return void
param map GLenum
-param mapsize GLint
+param mapsize GLsizei
param values const GLushort *
category 1.0
offset 253
@@ -4173,12 +4173,18 @@ param params GLint *
category GL_SGI_color_table
offset 429
+
+# GL_SGIX_pixel_texture
+
name PixelTexGenSGIX
return void
param mode GLenum
category GL_SGIX_pixel_texture
offset 430
+
+# GL_SGIS_pixel_texture
+
name PixelTexGenParameteriSGIS
return void
param pname GLenum
@@ -5532,11 +5538,16 @@ category GL_EXT_coordinate_frame
offset ?
+# GL_SUNX_constant_data
+
name FinishTextureSUNX
return void
category GL_SUNX_constant_data
offset ?
+
+# GL_SUN_global_alpha
+
name GlobalAlphaFactorbSUN
return void
param factor GLbyte
@@ -5585,6 +5596,9 @@ param factor GLuint
category GL_SUN_global_alpha
offset ?
+
+# GL_SUN_triangle_list
+
name ReplacementCodeuiSUN
return void
param code GLuint
@@ -5629,6 +5643,9 @@ param pointer const GLvoid *
category GL_SUN_triangle_list
offset ?
+
+# GL_SUN_vertex
+
name Color4ubVertex2fSUN
return void
param r GLubyte
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 42f8408480..45fdce57e4 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -257,9 +257,9 @@ struct _glapi_table
void (*PixelTransferi)(GLenum pname, GLint param); /* 248 */
void (*PixelStoref)(GLenum pname, GLfloat param); /* 249 */
void (*PixelStorei)(GLenum pname, GLint param); /* 250 */
- void (*PixelMapfv)(GLenum map, GLint mapsize, const GLfloat * values); /* 251 */
- void (*PixelMapuiv)(GLenum map, GLint mapsize, const GLuint * values); /* 252 */
- void (*PixelMapusv)(GLenum map, GLint mapsize, const GLushort * values); /* 253 */
+ void (*PixelMapfv)(GLenum map, GLsizei mapsize, const GLfloat * values); /* 251 */
+ void (*PixelMapuiv)(GLenum map, GLsizei mapsize, const GLuint * values); /* 252 */
+ void (*PixelMapusv)(GLenum map, GLsizei mapsize, const GLushort * values); /* 253 */
void (*ReadBuffer)(GLenum mode); /* 254 */
void (*CopyPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); /* 255 */
void (*ReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid * pixels); /* 256 */
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 4d373933d4..743800f616 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -1303,17 +1303,17 @@ KEYWORD1 void KEYWORD2 NAME(PixelStorei)(GLenum pname, GLint param)
DISPATCH(PixelStorei, (pname, param), (F, "glPixelStorei(0x%x, %d);\n", pname, param));
}
-KEYWORD1 void KEYWORD2 NAME(PixelMapfv)(GLenum map, GLint mapsize, const GLfloat * values)
+KEYWORD1 void KEYWORD2 NAME(PixelMapfv)(GLenum map, GLsizei mapsize, const GLfloat * values)
{
DISPATCH(PixelMapfv, (map, mapsize, values), (F, "glPixelMapfv(0x%x, %d, %p);\n", map, mapsize, (const void *) values));
}
-KEYWORD1 void KEYWORD2 NAME(PixelMapuiv)(GLenum map, GLint mapsize, const GLuint * values)
+KEYWORD1 void KEYWORD2 NAME(PixelMapuiv)(GLenum map, GLsizei mapsize, const GLuint * values)
{
DISPATCH(PixelMapuiv, (map, mapsize, values), (F, "glPixelMapuiv(0x%x, %d, %p);\n", map, mapsize, (const void *) values));
}
-KEYWORD1 void KEYWORD2 NAME(PixelMapusv)(GLenum map, GLint mapsize, const GLushort * values)
+KEYWORD1 void KEYWORD2 NAME(PixelMapusv)(GLenum map, GLsizei mapsize, const GLushort * values)
{
DISPATCH(PixelMapusv, (map, mapsize, values), (F, "glPixelMapusv(0x%x, %d, %p);\n", map, mapsize, (const void *) values));
}