From c966c6980c2a4a1e50b238f7607a9ce111f6c0b4 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 21 Feb 2011 16:46:02 -0700 Subject: [PATCH] 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. --- src/mesa/state_tracker/st_format.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index a532e089c0a..3f9c322d9a1 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -113,12 +113,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; } -- 2.30.2