summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-07-18 22:27:02 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-07-18 22:27:02 +0000
commitdf926955be59a0128eea44141eb46fc52556dc05 (patch)
tree8d9207e7dcd0e9fa29853b5c2a2fb5a12a65cfe2
parent813e56db511e783fcf1ad7bcfd40645451802bd7 (diff)
add missing 'return' after a few _mesa_error() calls in _mesa_GetTexImage()
-rw-r--r--src/mesa/main/teximage.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 083051aec7..523620bd40 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
- * Version: 6.5
+ * Version: 6.5.1
*
* Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
*
@@ -2101,20 +2101,24 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format,
if (!ctx->Extensions.EXT_paletted_texture && is_index_format(format)) {
_mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
+ return;
}
if (!ctx->Extensions.SGIX_depth_texture &&
!ctx->Extensions.ARB_depth_texture && is_depth_format(format)) {
_mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
+ return;
}
if (!ctx->Extensions.MESA_ycbcr_texture && is_ycbcr_format(format)) {
_mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
+ return;
}
if (!ctx->Extensions.EXT_packed_depth_stencil
&& is_depthstencil_format(format)) {
_mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
+ return;
}
if (!pixels)