fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-23 00:50:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

change glTexImage3D() internalFormat to GLenum to match other OpenGLs

Browse source
This commit is contained in:
Brian Paul 2001-03-26 20:02:38 +00:00
parent 0bc933a460
commit 5535aca5df
5 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/GL/gl.h
View file

@ -1,4 +1,4 @@
/* $Id: gl.h,v 1.53 2001/03/22 04:56:50 brianp Exp $ */
/* $Id: gl.h,v 1.54 2001/03/26 20:02:38 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -1591,7 +1591,7 @@ GLAPI void GLAPIENTRY glDrawRangeElements( GLenum mode, GLuint start,
GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
GLAPI void GLAPIENTRY glTexImage3D( GLenum target, GLint level,
GLint internalFormat,
GLenum internalFormat,
GLsizei width, GLsizei height,
GLsizei depth, GLint border,
GLenum format, GLenum type,

2
src/mesa/glapi/glapitable.h
View file

@ -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 */

4
src/mesa/glapi/glapitemp.h
View file

@ -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, ";"));
}

13
src/mesa/main/teximage.c
View file

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

4
src/mesa/main/teximage.h
View file

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