From a57e2c436bac4ce22d35681b45b513334dcb2fd9 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Thu, 23 Dec 2010 18:16:59 -0800
Subject: [PATCH] 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.
---
 src/mesa/main/formats.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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:
-- 
2.30.2