summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/texobj.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main/texobj.c')
-rw-r--r--src/mesa/main/texobj.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 275cc47915c..e06f8cd277c 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1,4 +1,4 @@
-/* $Id: texobj.c,v 1.25 2000/08/02 20:16:03 brianp Exp $ */
+/* $Id: texobj.c,v 1.26 2000/08/03 14:03:17 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -393,11 +393,13 @@ _mesa_GenTextures( GLsizei n, GLuint *texName )
GLint i;
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGenTextures");
- if (n<0) {
+ if (n < 0) {
gl_error( ctx, GL_INVALID_VALUE, "glGenTextures" );
return;
}
+ if (!texName)
+ return;
/*
* This must be atomic (generation and allocation of texture IDs)
@@ -434,6 +436,9 @@ _mesa_DeleteTextures( GLsizei n, const GLuint *texName)
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glDeleteTextures");
+ if (!texName)
+ return;
+
for (i=0;i<n;i++) {
struct gl_texture_object *t;
if (texName[i]>0) {
@@ -617,6 +622,9 @@ _mesa_PrioritizeTextures( GLsizei n, const GLuint *texName,
return;
}
+ if (!priorities)
+ return;
+
for (i = 0; i < n; i++) {
if (texName[i] > 0) {
struct gl_texture_object *t = (struct gl_texture_object *)
@@ -650,6 +658,9 @@ _mesa_AreTexturesResident(GLsizei n, const GLuint *texName,
return GL_FALSE;
}
+ if (!texName || !residences)
+ return GL_FALSE;
+
for (i = 0; i < n; i++) {
struct gl_texture_object *t;
if (texName[i] == 0) {