From: Brian Paul <brianp@vmware.com>
Date: Wed, 27 Oct 2010 02:23:57 +0000 (-0600)
Subject: mesa: fix bug in _mesa_is_format_integer()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ab50148fdafeb6496b4ab684e5b9a2355ccf542c;p=mesa.git

mesa: fix bug in _mesa_is_format_integer()

We only want to return true if it's an integer _color_ format, not a
depth and/or stencil format.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=31143
---

diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 3e786934771..f604e235138 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -1008,13 +1008,16 @@ _mesa_is_format_packed_depth_stencil(gl_format format)
 
 
 /**
- * Is the given format a signed/unsigned integer format?
+ * Is the given format a signed/unsigned integer color format?
  */
 GLboolean
 _mesa_is_format_integer(gl_format format)
 {
    const struct gl_format_info *info = _mesa_get_format_info(format);
-   return info->DataType == GL_INT || info->DataType == GL_UNSIGNED_INT;
+   return (info->DataType == GL_INT || info->DataType == GL_UNSIGNED_INT) &&
+      info->BaseFormat != GL_DEPTH_COMPONENT &&
+      info->BaseFormat != GL_DEPTH_STENCIL &&
+      info->BaseFormat != GL_STENCIL_INDEX;
 }