Mesa (master): i965: Remove default from brw_instruction_name switch to catch missing names.
Matt Turner
mattst88 at kemper.freedesktop.org
Mon Dec 8 16:50:48 UTC 2014
Module: Mesa
Branch: master
Commit: f65200ccc9115cec9da780d8cdd119e934fdc664
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f65200ccc9115cec9da780d8cdd119e934fdc664
Author: Matt Turner <mattst88 at gmail.com>
Date: Sat Dec 6 14:18:21 2014 -0800
i965: Remove default from brw_instruction_name switch to catch missing names.
The case-range extension is available in clang and gcc at least back to
3.4.0.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
---
src/mesa/drivers/dri/i965/brw_shader.cpp | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp
index c0ca26b..56aa757 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.cpp
+++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
@@ -380,12 +380,10 @@ brw_texture_offset(struct gl_context *ctx, int *offsets,
const char *
brw_instruction_name(enum opcode op)
{
- char *fallback;
-
- if (op < ARRAY_SIZE(opcode_descs) && opcode_descs[op].name)
- return opcode_descs[op].name;
-
switch (op) {
+ case BRW_OPCODE_MOV ... BRW_OPCODE_NOP:
+ assert(opcode_descs[op].name);
+ return opcode_descs[op].name;
case FS_OPCODE_FB_WRITE:
return "fb_write";
case FS_OPCODE_BLORP_FB_WRITE:
@@ -557,14 +555,9 @@ brw_instruction_name(enum opcode op)
return "gs_svb_set_dst_index";
case GS_OPCODE_FF_SYNC_SET_PRIMITIVES:
return "gs_ff_sync_set_primitives";
-
- default:
- /* Yes, this leaks. It's in debug code, it should never occur, and if
- * it does, you should just add the case to the list above.
- */
- asprintf(&fallback, "op%d", op);
- return fallback;
}
+
+ unreachable("not reached");
}
backend_visitor::backend_visitor(struct brw_context *brw,
More information about the mesa-commit
mailing list