Mesa (7.9): st/mesa: fix the default case in st_format_datatype()

Brian Paul brianp at kemper.freedesktop.org
Tue Feb 22 01:20:22 UTC 2011


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

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Feb 21 16:46:02 2011 -0700

st/mesa: fix the default case in st_format_datatype()

Part of the fix for piglit fbo-clear-formats

NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit c966c6980c2a4a1e50b238f7607a9ce111f6c0b4)

---

 src/mesa/state_tracker/st_format.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 9506460..3b80ced 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -112,12 +112,9 @@ st_format_datatype(enum pipe_format format)
       return GL_UNSIGNED_SHORT;
    }
    else {
-      /* compressed format? */
-      assert(0);
+      /* probably a compressed format, unsupported anyway */
+      return GL_NONE;
    }
-
-   assert(0);
-   return GL_NONE;
 }
 
 




More information about the mesa-commit mailing list