From 1aee8dafb5391e093f3a111f906ab0d8b6775510 Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 28 Jan 2012 13:55:41 +0100 Subject: mesa xserver git update 28 jan 2012 --- mesalib/src/mesa/main/texgetimage.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'mesalib/src/mesa/main/texgetimage.c') diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c index 818deb8e4..42495c8c7 100644 --- a/mesalib/src/mesa/main/texgetimage.c +++ b/mesalib/src/mesa/main/texgetimage.c @@ -462,6 +462,15 @@ get_tex_rgba(struct gl_context *ctx, GLuint dimensions, transferOps |= IMAGE_CLAMP_BIT; } } + /* This applies to RGB, RGBA textures. if the format is either LUMINANCE + * or LUMINANCE ALPHA, luminance (L) is computed as L=R+G+B .we need to + * clamp the sum to [0,1]. + */ + else if ((format == GL_LUMINANCE || + format == GL_LUMINANCE_ALPHA) && + dataType == GL_UNSIGNED_NORMALIZED) { + transferOps |= IMAGE_CLAMP_BIT; + } if (_mesa_is_format_compressed(texImage->TexFormat)) { get_tex_rgba_compressed(ctx, dimensions, format, type, -- cgit v1.2.3