Mesa (master): i915: Fix build break with empty unreachable()

Daniel Stone daniels at kemper.freedesktop.org
Fri May 5 17:25:36 UTC 2017


Module: Mesa
Branch: master
Commit: d4342b1398a001af1192497ca4db3a304f98c309
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d4342b1398a001af1192497ca4db3a304f98c309

Author: Daniel Stone <daniels at collabora.com>
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 <daniels at collabora.com>
Reported-by: Mark Janes <mark.a.janes at intel.com>

---

 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 00ab307168..371772867e 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




More information about the mesa-commit mailing list