[Mesa-stable] [PATCH 03/14] mesa: Fix conditions to test signed, unsigned integer format

Anuj Phogat anuj.phogat at gmail.com
Tue Jun 16 11:15:27 PDT 2015


Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Cc: <mesa-stable at lists.freedesktop.org>
---
 src/mesa/main/readpix.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
index caa2648..a9416ef 100644
--- a/src/mesa/main/readpix.c
+++ b/src/mesa/main/readpix.c
@@ -160,10 +160,12 @@ _mesa_readpixels_needs_slow_path(const struct gl_context *ctx, GLenum format,
       srcType = _mesa_get_format_datatype(rb->Format);
 
       if ((srcType == GL_INT &&
+           _mesa_is_enum_format_integer(format) &&
            (type == GL_UNSIGNED_INT ||
             type == GL_UNSIGNED_SHORT ||
             type == GL_UNSIGNED_BYTE)) ||
           (srcType == GL_UNSIGNED_INT &&
+           _mesa_is_enum_format_integer(format) &&
            (type == GL_INT ||
             type == GL_SHORT ||
             type == GL_BYTE))) {
-- 
1.9.3



More information about the mesa-stable mailing list