From 76086d7120152ebced634875889612d0c40a37bb Mon Sep 17 00:00:00 2001 From: Tobias Klausmann Date: Mon, 19 Jan 2015 21:51:38 +0100 Subject: mesa: change assert to unreachable in two format functions This fixes two problems reported by osc: I: Program returns random data in a function E: Mesa no-return-in-nonvoid-function ../../src/mesa/main/format_utils.c:180 E: Mesa no-return-in-nonvoid-function ../../src/mesa/main/glformats.c:2714 Reviewed-by: Matt Turner Signed-off-by: Tobias Klausmann --- src/mesa/main/format_utils.c | 2 +- src/mesa/main/glformats.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mesa/main') diff --git a/src/mesa/main/format_utils.c b/src/mesa/main/format_utils.c index eb650a2d4ce..4b44befaf4b 100644 --- a/src/mesa/main/format_utils.c +++ b/src/mesa/main/format_utils.c @@ -175,7 +175,7 @@ _mesa_compute_rgba2base2rgba_component_mapping(GLenum baseFormat, uint8_t *map) return needRebase; } default: - assert(!"Unexpected base format"); + unreachable("Unexpected base format"); } } diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c index 06f9aaf0db3..ff153837cdf 100644 --- a/src/mesa/main/glformats.c +++ b/src/mesa/main/glformats.c @@ -2712,5 +2712,5 @@ _mesa_format_from_format_and_type(GLenum format, GLenum type) * matches the GL format/type provided. We may need to add a new Mesa * format in that case. */ - assert(!"Unsupported format"); + unreachable("Unsupported format"); } -- cgit v1.2.3