From: Dylan Baker <dylan@pnwbakers.com>
Date: Wed, 11 Dec 2019 00:03:55 +0000 (-0800)
Subject: dri/nouveau: replace assert with unreachable
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=289f02d1d5990e052e21eb250f6d40b47d6eb12f;p=mesa.git

dri/nouveau: replace assert with unreachable

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 <marek.olsak@amd.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3024>
---

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");
 	}
 }