[Mesa-dev] [PATCH 08/18] i965: Structure code so unsupported inst will not generate more errors.

[Matt Turner]

We want to rely on brw_opcode_desc() always returning non-NULL in other
validation functions. Other validation functions will be in the else
case of the block added in this patch.
---
 src/mesa/drivers/dri/i965/brw_eu_validate.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_eu_validate.c b/src/mesa/drivers/dri/i965/brw_eu_validate.c
index 3225386..d3c15da 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_validate.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_validate.c
@@ -46,6 +46,7 @@ cat(struct string *dest, const struct string src)
 
 #define error(str) "\tERROR: " str "\n"
 
+#define ERROR(msg) ERROR_IF(true, msg)
 #define ERROR_IF(cond, msg)          \
    do {                              \
       if (cond) {                    \
@@ -168,8 +169,10 @@ brw_validate_instructions(const struct brw_codegen *p, int start_offset,
          break;
       }
 
-      ERROR_IF(is_unsupported_inst(devinfo, inst),
-               "Instruction not supported on this Gen");
+      if (is_unsupported_inst(devinfo, inst)) {
+         ERROR("Instruction not supported on this Gen");
+      } else {
+      }
 
       if (brw_inst_opcode(devinfo, inst) == BRW_OPCODE_SEND) {
          ERROR_IF(brw_inst_src0_address_mode(devinfo, inst) !=
-- 
2.7.3