diff options
| author | Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de> | 2015-01-19 21:51:38 +0100 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2015-01-21 13:17:27 -0800 |
| commit | 76086d7120152ebced634875889612d0c40a37bb (patch) | |
| tree | a041eb1e93c21a01d2c405d8e8bb3b69b08a390f /src/mesa/main | |
| parent | 7da60eca4f9e8b8e38b709e728ea94b07be1b0e4 (diff) | |
| download | external_mesa3d-76086d7120152ebced634875889612d0c40a37bb.zip external_mesa3d-76086d7120152ebced634875889612d0c40a37bb.tar.gz external_mesa3d-76086d7120152ebced634875889612d0c40a37bb.tar.bz2 | |
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>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/format_utils.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/glformats.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/format_utils.c b/src/mesa/main/format_utils.c index eb650a2..4b44bef 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 06f9aaf..ff15383 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"); } |