From: Vinson Lee <vlee@vmware.com>
Date: Fri, 24 Dec 2010 02:16:59 +0000 (-0800)
Subject: mesa: Assert format is not MESA_FORMAT_COUNT in _mesa_format_to_type_and_comps.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a57e2c436bac4ce22d35681b45b513334dcb2fd9;p=mesa.git

mesa: Assert format is not MESA_FORMAT_COUNT in _mesa_format_to_type_and_comps.

The case of format being MESA_FORMAT_COUNT should never occur.
---

diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index fcc8526c404..a6bec486b89 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -1531,8 +1531,11 @@ _mesa_format_to_type_and_comps(gl_format format,
       *comps = 4;
       return;
 
-   case MESA_FORMAT_NONE:
    case MESA_FORMAT_COUNT:
+      assert(0);
+      return;
+
+   case MESA_FORMAT_NONE:
    /* For debug builds, warn if any formats are not handled */
 #ifdef DEBUG
    default: