From: Anuj Phogat Date: Thu, 11 Jun 2015 23:44:45 +0000 (-0700) Subject: mesa: Set green, blue channels to zero only for formats with these components X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bbbefec7323d0a338346233ab4ab715bcf4e1b78;p=mesa.git mesa: Set green, blue channels to zero only for formats with these components This is an optimization which avoids setting pixel transfer operations when not required. _mesa_ReadPixels falls back to slower path if transfer operations are set. Signed-off-by: Anuj Phogat Reviewed-by: Iago Toral Quiroga --- diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index ca10bbe81f6..826f2239d11 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -3159,9 +3159,16 @@ decompress_texture_image(struct gl_context *ctx, * returned as red and two-channel texture values are returned as * red/alpha. */ - if ((baseTexFormat == GL_LUMINANCE || - baseTexFormat == GL_LUMINANCE_ALPHA || - baseTexFormat == GL_INTENSITY) || + if (((baseTexFormat == GL_LUMINANCE || + baseTexFormat == GL_LUMINANCE_ALPHA || + baseTexFormat == GL_INTENSITY) && + (destBaseFormat == GL_RGBA || + destBaseFormat == GL_RGB || + destBaseFormat == GL_RG || + destBaseFormat == GL_GREEN || + destBaseFormat == GL_BLUE || + destBaseFormat == GL_BGRA || + destBaseFormat == GL_BGR)) || /* If we're reading back an RGB(A) texture (using glGetTexImage) as * luminance then we need to return L=tex(R). */