diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/glapi/glapitable.h | 2 | ||||
| -rw-r--r-- | src/mesa/glapi/glapitemp.h | 4 | ||||
| -rw-r--r-- | src/mesa/main/teximage.c | 13 | ||||
| -rw-r--r-- | src/mesa/main/teximage.h | 4 |
4 files changed, 12 insertions, 11 deletions
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h index 248b936149b..b20ca8c5844 100644 --- a/src/mesa/glapi/glapitable.h +++ b/src/mesa/glapi/glapitable.h @@ -377,7 +377,7 @@ struct _glapi_table void (*Minmax)(GLenum target, GLenum internalformat, GLboolean sink); /* 368 */ void (*ResetHistogram)(GLenum target); /* 369 */ void (*ResetMinmax)(GLenum target); /* 370 */ - void (*TexImage3D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels); /* 371 */ + void (*TexImage3D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels); /* 371 */ void (*TexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid * pixels); /* 372 */ void (*CopyTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); /* 373 */ void (*ActiveTextureARB)(GLenum texture); /* 374 */ diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h index 62038f54a9b..b4e8273eca1 100644 --- a/src/mesa/glapi/glapitemp.h +++ b/src/mesa/glapi/glapitemp.h @@ -1,4 +1,4 @@ -/* $Id: glapitemp.h,v 1.25 2001/03/12 00:48:38 gareth Exp $ */ +/* $Id: glapitemp.h,v 1.26 2001/03/26 20:02:38 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1155,7 +1155,7 @@ KEYWORD1 void KEYWORD2 NAME(DrawRangeElements)(GLenum mode, GLuint start, GLuint DISPATCH(DrawRangeElements, (mode, start, end, count, type, indices), (F, ";")); } -KEYWORD1 void KEYWORD2 NAME(TexImage3D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels) +KEYWORD1 void KEYWORD2 NAME(TexImage3D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels) { DISPATCH(TexImage3D, (target, level, internalformat, width, height, depth, border, format, type, pixels), (F, ";")); } diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index cb7447769c7..a92172a39b2 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1,4 +1,4 @@ -/* $Id: teximage.c,v 1.86 2001/03/19 02:25:35 keithw Exp $ */ +/* $Id: teximage.c,v 1.87 2001/03/26 20:02:38 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1511,7 +1511,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat, * Note that width and height include the border. */ void -_mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat, +_mesa_TexImage3D( GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels ) @@ -1524,7 +1524,7 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat, struct gl_texture_object *texObj; struct gl_texture_image *texImage; - if (texture_error_check(ctx, target, level, internalFormat, + if (texture_error_check(ctx, target, level, (GLint) internalFormat, format, type, 3, width, height, depth, border)) { return; /* error was recorded */ } @@ -1554,7 +1554,7 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat, ASSERT(ctx->Driver.TexImage3D); if (pixels) { - (*ctx->Driver.TexImage3D)(ctx, target, level, internalFormat, + (*ctx->Driver.TexImage3D)(ctx, target, level, (GLint) internalFormat, width, height, depth, border, format, type, pixels, &ctx->Unpack, texObj, texImage); @@ -1562,7 +1562,8 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat, else { GLubyte *dummy = make_null_texture(width, height, depth, format); if (dummy) { - (*ctx->Driver.TexImage3D)(ctx, target, level, internalFormat, + (*ctx->Driver.TexImage3D)(ctx, target, level, + (GLint) internalFormat, width, height, depth, border, format, GL_UNSIGNED_BYTE, dummy, &_mesa_native_packing, texObj, texImage); @@ -1618,7 +1619,7 @@ _mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalFormat, GLint border, GLenum format, GLenum type, const GLvoid *pixels ) { - _mesa_TexImage3D(target, level, (GLint) internalFormat, width, height, + _mesa_TexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels); } diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h index a19f806118c..b5664e4efaa 100644 --- a/src/mesa/main/teximage.h +++ b/src/mesa/main/teximage.h @@ -1,4 +1,4 @@ -/* $Id: teximage.h,v 1.17 2001/03/12 00:48:38 gareth Exp $ */ +/* $Id: teximage.h,v 1.18 2001/03/26 20:02:39 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -74,7 +74,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalformat, extern void -_mesa_TexImage3D( GLenum target, GLint level, GLint internalformat, +_mesa_TexImage3D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels ); |