summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Borca <[email protected]>2004-12-10 07:36:35 +0000
committerDaniel Borca <[email protected]>2004-12-10 07:36:35 +0000
commit3cc28c96cd2003f9a598a36520305bba58d6489f (patch)
treec0cfb03c703246a828cd60c55a4c3ba01eeadd4d
parent7af80ca8c1f14db306f1dc413bec389ee7ffcdb7 (diff)
allow GetTexImage with RGBA format and COLOR_INDEX internalformat
-rw-r--r--src/mesa/main/teximage.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 4dff27567e0..127e9bf5693 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1954,10 +1954,12 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format,
}
/* Make sure the requested image format is compatible with the
- * texture's format.
+ * texture's format. We let the colorformat-indexformat go through,
+ * because the texelfetcher will dequantize to full rgba.
*/
if (is_color_format(format)
- && !is_color_format(texImage->TexFormat->BaseFormat)) {
+ && !is_color_format(texImage->TexFormat->BaseFormat)
+ && !is_index_format(texImage->TexFormat->BaseFormat)) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
return;
}