Mesa (master): mesa: Assert format is not MESA_FORMAT_COUNT in _mesa_format_to_type_and_comps.

Vinson Lee vlee at kemper.freedesktop.org
Fri Dec 24 02:20:01 UTC 2010


Module: Mesa
Branch: master
Commit: a57e2c436bac4ce22d35681b45b513334dcb2fd9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a57e2c436bac4ce22d35681b45b513334dcb2fd9

Author: Vinson Lee <vlee at vmware.com>
Date:   Thu Dec 23 18:16:59 2010 -0800

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 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index fcc8526..a6bec48 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:




More information about the mesa-commit mailing list