diff options
| author | Alan Hourihane <[email protected]> | 2008-11-20 13:44:13 +0000 |
|---|---|---|
| committer | Alan Hourihane <[email protected]> | 2008-11-20 13:44:13 +0000 |
| commit | ef2bf418b45c7966e9fe78359058b8d44f570be1 (patch) | |
| tree | c0bc3be44bae336ca4c9133ffb2529c8d99bbc0f /src/mesa/main/image.c | |
| parent | 4f3dcf3864c3cbd8a6ebc6af38e53d57e4d421d6 (diff) | |
| parent | b6bb5e09e0ad1f61f96c65bbc870bd493df12f1a (diff) | |
Merge commit 'origin/master' into gallium-0.2
Diffstat (limited to 'src/mesa/main/image.c')
| -rw-r--r-- | src/mesa/main/image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index bd38e0c3d8c..d3282d42e99 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -1689,7 +1689,7 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4], if (dstFormat == GL_LUMINANCE || dstFormat == GL_LUMINANCE_ALPHA) { /* compute luminance values */ - if (dstType != GL_FLOAT || ctx->Color.ClampReadColor == GL_TRUE) { + if (transferOps & IMAGE_CLAMP_BIT) { for (i = 0; i < n; i++) { GLfloat sum = rgba[i][RCOMP] + rgba[i][GCOMP] + rgba[i][BCOMP]; luminance[i] = CLAMP(sum, 0.0F, 1.0F); |