Module: Mesa Branch: 17.1 Commit: e1678159b162fcb28b6611dade44b75b528197a2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e1678159b162fcb28b6611dade44b75b528197a2
Author: Daniel Stone <[email protected]> Date: Fri May 5 18:24:44 2017 +0100 i915: Fix build break with empty unreachable() Actually put something in unreachable(), so as not to break the build on a Friday evening. Signed-off-by: Daniel Stone <[email protected]> Reported-by: Mark Janes <[email protected]> (cherry picked from commit d4342b1398a001af1192497ca4db3a304f98c309) Fixes: 467332a0ab2 ("i965: Use helper function for modifier -> tiling") Fixes: 8b8af19065a ("i965: Set modifier for imported and duplicated images") --- src/mesa/drivers/dri/i965/intel_screen.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 6a7c7e1d78..0aba1bef7f 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -309,8 +309,7 @@ modifier_to_tiling(uint64_t modifier) return tiling_modifier_map[i].tiling; } - assert(0 && "modifier_to_tiling should only receive known modifiers"); - unreachable(); + unreachable("modifier_to_tiling should only receive known modifiers"); } static uint64_t @@ -323,8 +322,7 @@ tiling_to_modifier(uint32_t tiling) return tiling_modifier_map[i].modifier; } - assert(0 && "tiling_to_modifier received unknown tiling mode"); - unreachable(); + unreachable("tiling_to_modifier received unknown tiling mode"); } static void _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
