diff options
| author | Brian Paul <[email protected]> | 2012-02-29 20:55:50 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-03-08 20:10:58 -0700 |
| commit | 5beba3d0ba593b661451217a5ffcdf68644cc903 (patch) | |
| tree | 5b14cfd1db36ca1cd2c64e17fb67b5bcdf65d1ee /src/mesa | |
| parent | ad897fff7730298c21289768d9b1b55f3d166ac5 (diff) | |
mesa: use _mesa_rebase_rgba_float/uint() in glGetTexImage code
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: José Fonseca <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/texgetimage.c | 77 |
1 files changed, 4 insertions, 73 deletions
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c index a02a4915695..44a828adfde 100644 --- a/src/mesa/main/texgetimage.c +++ b/src/mesa/main/texgetimage.c @@ -266,13 +266,8 @@ get_tex_rgba_compressed(struct gl_context *ctx, GLuint dimensions, if (baseFormat == GL_LUMINANCE || baseFormat == GL_LUMINANCE_ALPHA) { - /* Set green and blue to zero since the pack function here will - * compute L=R+G+B. - */ - GLuint i; - for (i = 0; i < width * height; i++) { - tempImage[i * 4 + GCOMP] = tempImage[i * 4 + BCOMP] = 0.0f; - } + _mesa_rebase_rgba_float(width * height, (GLfloat (*)[4]) tempImage, + baseFormat); } srcRow = tempImage; @@ -340,76 +335,12 @@ get_tex_rgba_uncompressed(struct gl_context *ctx, GLuint dimensions, if (is_integer) { _mesa_unpack_uint_rgba_row(texFormat, width, src, rgba_uint); - - if (texImage->_BaseFormat == GL_ALPHA) { - GLuint col; - for (col = 0; col < width; col++) { - rgba_uint[col][RCOMP] = 0; - rgba_uint[col][GCOMP] = 0; - rgba_uint[col][BCOMP] = 0; - } - } - else if (texImage->_BaseFormat == GL_LUMINANCE) { - GLuint col; - for (col = 0; col < width; col++) { - rgba_uint[col][GCOMP] = 0; - rgba_uint[col][BCOMP] = 0; - rgba_uint[col][ACOMP] = 1; - } - } - else if (texImage->_BaseFormat == GL_LUMINANCE_ALPHA) { - GLuint col; - for (col = 0; col < width; col++) { - rgba_uint[col][GCOMP] = 0; - rgba_uint[col][BCOMP] = 0; - } - } - else if (texImage->_BaseFormat == GL_INTENSITY) { - GLuint col; - for (col = 0; col < width; col++) { - rgba_uint[col][GCOMP] = 0; - rgba_uint[col][BCOMP] = 0; - rgba_uint[col][ACOMP] = 1; - } - } - + _mesa_rebase_rgba_uint(width, rgba_uint, texImage->_BaseFormat); _mesa_pack_rgba_span_int(ctx, width, rgba_uint, format, type, dest); } else { _mesa_unpack_rgba_row(texFormat, width, src, rgba); - - if (texImage->_BaseFormat == GL_ALPHA) { - GLuint col; - for (col = 0; col < width; col++) { - rgba[col][RCOMP] = 0.0F; - rgba[col][GCOMP] = 0.0F; - rgba[col][BCOMP] = 0.0F; - } - } - else if (texImage->_BaseFormat == GL_LUMINANCE) { - GLuint col; - for (col = 0; col < width; col++) { - rgba[col][GCOMP] = 0.0F; - rgba[col][BCOMP] = 0.0F; - rgba[col][ACOMP] = 1.0F; - } - } - else if (texImage->_BaseFormat == GL_LUMINANCE_ALPHA) { - GLuint col; - for (col = 0; col < width; col++) { - rgba[col][GCOMP] = 0.0F; - rgba[col][BCOMP] = 0.0F; - } - } - else if (texImage->_BaseFormat == GL_INTENSITY) { - GLuint col; - for (col = 0; col < width; col++) { - rgba[col][GCOMP] = 0.0F; - rgba[col][BCOMP] = 0.0F; - rgba[col][ACOMP] = 1.0F; - } - } - + _mesa_rebase_rgba_float(width, rgba, texImage->_BaseFormat); _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba, format, type, dest, &ctx->Pack, transferOps); |