fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: move invariant code out of loop in get_tex_rgba()

Browse source
This commit is contained in:
Brian Paul 2011-06-13 08:18:11 -06:00
parent 2f0b44f981
commit e6e1864f1c
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -233,6 +233,7 @@ get_tex_rgba(struct gl_context *ctx, GLuint dimensions,
const GLint width = texImage->Width;
const GLint height = texImage->Height;
const GLint depth = texImage->Depth;
const GLenum dataType = _mesa_get_format_datatype(texImage->TexFormat);
/* Normally, no pixel transfer ops are performed during glGetTexImage.
* The only possible exception is component clamping to [0,1].
*/
@ -248,6 +249,19 @@ get_tex_rgba(struct gl_context *ctx, GLuint dimensions,
return;
}
/* Clamping does not apply to GetTexImage (final conversion)?
* Looks like we need clamp though when going from format
* containing negative values to unsigned format.
*/
if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA) {
transferOps |= IMAGE_CLAMP_BIT;
}
else if (!type_with_negative_values(type) &&
(dataType == GL_FLOAT ||
dataType == GL_SIGNED_NORMALIZED)) {
transferOps |= IMAGE_CLAMP_BIT;
}
/* glGetTexImage always returns sRGB data for sRGB textures. Make sure the
* fetch functions return sRGB data without linearizing it.
*/
@ -262,20 +276,6 @@ get_tex_rgba(struct gl_context *ctx, GLuint dimensions,
width, height, format, type,
img, row, 0);
GLint col;
GLenum dataType = _mesa_get_format_datatype(texImage->TexFormat);
/* clamp does not apply to GetTexImage (final conversion)?
* Looks like we need clamp though when going from format
* containing negative values to unsigned format.
*/
if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA) {
transferOps |= IMAGE_CLAMP_BIT;
}
else if (!type_with_negative_values(type) &&
(dataType == GL_FLOAT ||
dataType == GL_SIGNED_NORMALIZED)) {
transferOps |= IMAGE_CLAMP_BIT;
}
for (col = 0; col < width; col++) {
texImage->FetchTexelf(texImage, col, row, img, rgba[col]);