mesa: Handle integer formats in need_rgb_to_luminance_conversion()
authorAnuj Phogat <anuj.phogat@gmail.com>
Fri, 1 May 2015 06:35:20 +0000 (23:35 -0700)
committerAnuj Phogat <anuj.phogat@gmail.com>
Mon, 15 Jun 2015 16:07:28 +0000 (09:07 -0700)
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>
src/mesa/main/readpix.c

index df46f8361b931e3636a430a92ca054299eeb0ba2..9166a50c22eab915b2cd6fd51e433b6139b06737 100644 (file)
@@ -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);
 }