dri/nouveau: replace assert with unreachable
authorDylan Baker <dylan@pnwbakers.com>
Wed, 11 Dec 2019 00:03:55 +0000 (16:03 -0800)
committerDylan Baker <dylan@pnwbakers.com>
Tue, 21 Apr 2020 18:09:03 +0000 (11:09 -0700)
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>

src/mesa/drivers/dri/nouveau/nouveau_texture.c

index 8afdbbeb3b355bbd0aeb4c621ea9360904e110c4..b5ab7bafc12122efd7f0d784a45785bf510394df 100644 (file)
@@ -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");
        }
 }