Mesa (master): mesa: Handle integer formats in need_rgb_to_luminance_conversion()

[Anuj Phogat]

Module: Mesa
Branch: master
Commit: 82abdf209a2fb5b95b2bae80045aecc61202b13c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=82abdf209a2fb5b95b2bae80045aecc61202b13c

Author: Anuj Phogat <anuj.phogat at gmail.com>
Date:   Thu Apr 30 23:35:20 2015 -0700

mesa: Handle integer formats in need_rgb_to_luminance_conversion()

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

---

 src/mesa/main/readpix.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
index df46f83..9166a50 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);
 }