summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2008-02-15 13:41:39 -0700
committerBrian <brian.paul@tungstengraphics.com>2008-02-15 13:42:12 -0700
commit1d0ddea92fc933d623caf1b9d3bda47b6f8296f8 (patch)
treec8f7b5db2b0fc6897bbfe1eedef8b1ecc4ab7fa4 /src/mesa
parent4955325ae920df71a7c8b69cad89ac7a9828e047 (diff)
Fix glBindTexture crash (bug 14514)
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/texobj.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 3e017c1eda..24d8110b00 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -861,7 +861,8 @@ _mesa_BindTexture( GLenum target, GLuint texName )
newTexObj = ctx->Shared->Default2DArray;
break;
default:
- ; /* Bad targets are caught above */
+ _mesa_error(ctx, GL_INVALID_ENUM, "glBindTexture(target)");
+ return;
}
}
else {
@@ -939,6 +940,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
texUnit->Current2DArray = newTexObj;
break;
default:
+ /* Bad target should be caught above */
_mesa_problem(ctx, "bad target in BindTexture");
return;
}