fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 19:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

meta: Fix glCopyTexImage(GL_LUMINANCE) from non-GL_LUMINANCE source.

Browse source 
glReadPixels() was performing RGB -> L conversion differently from the
glTexImage() style conversion appropriate for glCopyTexImage().

Fixes gles2conform copy_texture.
This commit is contained in:
Eric Anholt 2011-06-08 13:00:51 -07:00
parent df46eb8ec0
commit 296e6b9038
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/mesa/drivers/common/meta.c
View file

@ -2691,12 +2691,26 @@ copy_tex_image(struct gl_context *ctx, GLuint dims, GLenum target, GLint level,
GLenum format, type;
GLint bpp;
void *buf;
struct gl_renderbuffer *read_rb = ctx->ReadBuffer->_ColorReadBuffer;
texObj = _mesa_get_current_tex_object(ctx, target);
texImage = _mesa_get_tex_image(ctx, texObj, target, level);
/* Choose format/type for temporary image buffer */
format = _mesa_base_tex_format(ctx, internalFormat);
if (format == GL_LUMINANCE &&
_mesa_get_format_base_format(read_rb->Format) != GL_LUMINANCE) {
/* The glReadPixels() path will convert RGB to luminance by
* summing R+G+B. glCopyTexImage() is supposed to behave as
* glCopyPixels, which doesn't do that change, and instead
* leaves it up to glTexImage which converts RGB to luminance by
* just taking the R channel. To avoid glReadPixels() trashing
* our data, use RGBA for our temporary image.
*/
format = GL_RGBA;
}
type = get_temp_image_type(ctx, format);
bpp = _mesa_bytes_per_pixel(format, type);
if (bpp <= 0) {