fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 04:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: use _mesa_rebase_rgba_float/uint() in glGetTexImage code

Browse source 
NOTE: This is a candidate for the 8.0 branch.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
This commit is contained in:
Brian Paul 2012-02-29 20:55:50 -07:00
parent ad897fff77
commit 5beba3d0ba
1 changed files with 4 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/mesa/main/texgetimage.c
View file

@ -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);