From: Anuj Phogat <anuj.phogat@gmail.com>
Date: Fri, 1 May 2015 06:35:20 +0000 (-0700)
Subject: mesa: Handle integer formats in need_rgb_to_luminance_conversion()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=82abdf209a2fb5b95b2bae80045aecc61202b13c;p=mesa.git

mesa: Handle integer formats in need_rgb_to_luminance_conversion()

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Cc: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
---

diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
index df46f8361b9..9166a50c22e 100644
--- a/src/mesa/main/readpix.c
+++ b/src/mesa/main/readpix.c
@@ -54,7 +54,10 @@ need_rgb_to_luminance_conversion(mesa_format texFormat, GLenum format)
    return (baseTexFormat == GL_RG ||
            baseTexFormat == GL_RGB ||
            baseTexFormat == GL_RGBA) &&
-          (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA);
+          (format == GL_LUMINANCE ||
+           format == GL_LUMINANCE_ALPHA ||
+           format == GL_LUMINANCE_INTEGER_EXT ||
+           format == GL_LUMINANCE_ALPHA_INTEGER_EXT);
 }