From: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Date: Mon, 19 Jan 2015 20:51:38 +0000 (+0100)
Subject: mesa: change assert to unreachable in two format functions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=76086d7120152ebced634875889612d0c40a37bb;p=mesa.git

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 <mattst88@gmail.com>
Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
---

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