From: Anuj Phogat <anuj.phogat@gmail.com>
Date: Fri, 12 Jun 2015 21:58:46 +0000 (-0700)
Subject: meta: Use _mesa_need_rgb_to_luminance_conversion() in decompress_texture_image()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a9cbb2c722615e11818066cbe33006c5cfc43381;p=mesa.git

meta: Use _mesa_need_rgb_to_luminance_conversion() in decompress_texture_image()

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
---

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index b7c91bfd65e..bde544ef490 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -3164,11 +3164,8 @@ decompress_texture_image(struct gl_context *ctx,
           /* If we're reading back an RGB(A) texture (using glGetTexImage) as
 	   * luminance then we need to return L=tex(R).
 	   */
-          ((baseTexFormat == GL_RGBA ||
-            baseTexFormat == GL_RGB  ||
-            baseTexFormat == GL_RG) &&
-          (destBaseFormat == GL_LUMINANCE ||
-           destBaseFormat == GL_LUMINANCE_ALPHA))) {
+          _mesa_need_rgb_to_luminance_conversion(baseTexFormat,
+                                                 destBaseFormat)) {
          /* Green and blue must be zero */
          _mesa_PixelTransferf(GL_GREEN_SCALE, 0.0f);
          _mesa_PixelTransferf(GL_BLUE_SCALE, 0.0f);