fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 12:18:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

added more format/type error checking code

Browse source
This commit is contained in:
Brian Paul 1999-10-19 20:31:08 +00:00
parent d471473b58
commit 351752caff
1 changed files with 41 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/mesa/main/image.c
View file

@ -1,4 +1,4 @@
/* $Id: image.c,v 1.6 1999/10/13 18:42:50 brianp Exp $ */
/* $Id: image.c,v 1.7 1999/10/19 20:31:08 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -537,6 +537,9 @@ GLboolean gl_image_error_test( GLcontext *ctx, const struct gl_image *image,
gl_error( ctx, GL_INVALID_VALUE, msg );
return GL_TRUE;
}
else if (!gl_is_legal_format_and_type(image->Format, image->Type)) {
return GL_TRUE;
}
else {
return GL_FALSE;
}
@ -565,6 +568,15 @@ unpack_depth_image( GLcontext *ctx, GLenum type, GLint width, GLint height,
GLushort *sDst;
GLuint *iDst;
GLint i, j;
GLboolean errorType;
errorType = type != GL_BYTE &&
type != GL_UNSIGNED_BYTE &&
type != GL_SHORT &&
type != GL_UNSIGNED_SHORT &&
type != GL_INT &&
type != GL_UNSIGNED_INT &&
type != GL_FLOAT;
image = alloc_image();
if (image) {
@ -573,6 +585,10 @@ unpack_depth_image( GLcontext *ctx, GLenum type, GLint width, GLint height,
image->Depth = 1;
image->Components = 1;
image->Format = GL_DEPTH_COMPONENT;
if (errorType) {
image->Type = type;
image->Data = NULL;
}
if (type==GL_UNSIGNED_SHORT) {
image->Type = GL_UNSIGNED_SHORT;
image->Data = MALLOC( width * height * sizeof(GLushort));
@ -593,6 +609,9 @@ unpack_depth_image( GLcontext *ctx, GLenum type, GLint width, GLint height,
return NULL;
}
if (errorType)
return image;
fDst = (GLfloat *) image->Data;
sDst = (GLushort *) image->Data;
iDst = (GLuint *) image->Data;
@ -700,9 +719,19 @@ unpack_stencil_image( GLcontext *ctx, GLenum type, GLint width, GLint height,
struct gl_image *image;
GLubyte *dst;
GLint i, j;
GLboolean errorType;
assert(sizeof(GLstencil) == sizeof(GLubyte));
errorType = type != GL_BYTE &&
type != GL_UNSIGNED_BYTE &&
type != GL_SHORT &&
type != GL_UNSIGNED_SHORT &&
type != GL_INT &&
type != GL_UNSIGNED_INT &&
type != GL_FLOAT &&
type != GL_BITMAP;
image = alloc_image();
if (image) {
image->Width = width;
@ -710,8 +739,14 @@ unpack_stencil_image( GLcontext *ctx, GLenum type, GLint width, GLint height,
image->Depth = 1;
image->Components = 1;
image->Format = GL_STENCIL_INDEX;
image->Type = GL_UNSIGNED_BYTE;
image->Data = MALLOC( width * height * sizeof(GLubyte));
if (errorType) {
image->Type = type;
image->Data = NULL;
}
else {
image->Type = GL_UNSIGNED_BYTE;
image->Data = MALLOC( width * height * sizeof(GLubyte));
}
image->RefCount = 0;
if (!image->Data)
return image;
@ -720,6 +755,9 @@ unpack_stencil_image( GLcontext *ctx, GLenum type, GLint width, GLint height,
return NULL;
}
if (errorType)
return image; /* error will be generated later */
dst = (GLubyte *) image->Data;
for (i=0;i<height;i++) {