From 289f02d1d5990e052e21eb250f6d40b47d6eb12f Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 10 Dec 2019 16:03:55 -0800 Subject: [PATCH] dri/nouveau: replace assert with unreachable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit I don't know why removing imports.h suddenly makes clang realize that this function can not return in a non-debug build, but it does. Unreachable is better because it doesn't have this problem. Reviewed-by: Marek Olšák Reviewed-by: Kristian H. Kristensen Reviewed-by: Matt Turner Part-of: --- src/mesa/drivers/dri/nouveau/nouveau_texture.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c index 8afdbbeb3b3..b5ab7bafc12 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c @@ -41,6 +41,8 @@ #include "util/u_memory.h" #include "drivers/common/meta.h" #include "swrast/s_texfetch.h" +#include "util/macros.h" + static struct gl_texture_object * nouveau_texture_new(struct gl_context *ctx, GLuint name, GLenum target) @@ -246,7 +248,7 @@ nouveau_choose_tex_format(struct gl_context *ctx, GLenum target, return MESA_FORMAT_RGBA_DXT5; default: - assert(0); + unreachable("Unknown format"); } } -- 2.30.2