diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-15 15:01:30 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-15 15:01:30 +0200 |
| commit | 4420369d700d9db1563f8647e1889c6a0972ea2c (patch) | |
| tree | 91e4c4e8503de8472048662e1e0b2ac7caa82e09 /mesalib/src/mesa/main/image.c | |
| parent | e066f54c99aecce620158fe7f31589242df55677 (diff) | |
| download | vcxsrv-4420369d700d9db1563f8647e1889c6a0972ea2c.tar.gz vcxsrv-4420369d700d9db1563f8647e1889c6a0972ea2c.tar.bz2 vcxsrv-4420369d700d9db1563f8647e1889c6a0972ea2c.zip | |
libxtrans libXmu libXext mesa pixman git update 15 sept 2011
Diffstat (limited to 'mesalib/src/mesa/main/image.c')
| -rw-r--r-- | mesalib/src/mesa/main/image.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mesalib/src/mesa/main/image.c b/mesalib/src/mesa/main/image.c index 3e75e7c6b..66d7eec65 100644 --- a/mesalib/src/mesa/main/image.c +++ b/mesalib/src/mesa/main/image.c @@ -1513,12 +1513,8 @@ _mesa_convert_colors(GLenum srcType, const GLvoid *src, GLubyte (*dst1)[4] = (GLubyte (*)[4]) (useTemp ? tempBuffer : dst); GLuint i; for (i = 0; i < count; i++) { - if (!mask || mask[i]) { - UNCLAMPED_FLOAT_TO_UBYTE(dst1[i][RCOMP], src4[i][RCOMP]); - UNCLAMPED_FLOAT_TO_UBYTE(dst1[i][GCOMP], src4[i][GCOMP]); - UNCLAMPED_FLOAT_TO_UBYTE(dst1[i][BCOMP], src4[i][BCOMP]); - UNCLAMPED_FLOAT_TO_UBYTE(dst1[i][ACOMP], src4[i][ACOMP]); - } + if (!mask || mask[i]) + _mesa_unclamped_float_rgba_to_ubyte(dst1[i], src4[i]); } if (useTemp) memcpy(dst, tempBuffer, count * 4 * sizeof(GLubyte)); |