From f9a4fc9b1519337d6f3da9c6cacd20adba5fe081 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sat, 19 Nov 2016 19:20:02 -0800 Subject: [PATCH] i965: Mark error annotation on correct SIMD16 inst. inst, whose assignment can be seen in the last line of context pointed to the correct instruction in the SIMD16 program, but src_offset was the offset from the beginning of the SIMD16 program. So if an instruction at offset 0x100 in the SIMD16 program was illegal, we would mark an error on the instruction at offset 0x100 (which is likely in the SIMD8 program). Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_eu_validate.c | 4 ++-- 1 file changed, 2 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 0e736ed01d8..fa1d67c0c0a 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_validate.c +++ b/src/mesa/drivers/dri/i965/brw_eu_validate.c @@ -135,10 +135,10 @@ brw_validate_instructions(const struct brw_codegen *p, int start_offset, struct annotation_info *annotation) { const struct gen_device_info *devinfo = p->devinfo; - const void *store = p->store + start_offset / 16; + const void *store = p->store; bool valid = true; - for (int src_offset = 0; src_offset < p->next_insn_offset - start_offset; + for (int src_offset = start_offset; src_offset < p->next_insn_offset; src_offset += sizeof(brw_inst)) { struct string error_msg = { .str = NULL, .len = 0 }; const brw_inst *inst = store + src_offset; -- 2.30.2