summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTobias Klausmann <[email protected]>2015-01-19 21:51:38 +0100
committerMatt Turner <[email protected]>2015-01-21 13:17:27 -0800
commit76086d7120152ebced634875889612d0c40a37bb (patch)
treea041eb1e93c21a01d2c405d8e8bb3b69b08a390f /src
parent7da60eca4f9e8b8e38b709e728ea94b07be1b0e4 (diff)
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 <[email protected]> Signed-off-by: Tobias Klausmann <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/format_utils.c2
-rw-r--r--src/mesa/main/glformats.c2
2 files changed, 2 insertions, 2 deletions
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");
}