From: Kevin Rogovin <[email protected]> Without this fix, disassembling of GEN shaders with GPU commands that the disassembler does not know would result in errors being added to the annotator which would crash when more than one error was added.
Signed-off-by: Kevin Rogovin <[email protected]> --- src/intel/compiler/intel_asm_annotation.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/intel/compiler/intel_asm_annotation.c b/src/intel/compiler/intel_asm_annotation.c index b07a545a12..7aa222f04e 100644 --- a/src/intel/compiler/intel_asm_annotation.c +++ b/src/intel/compiler/intel_asm_annotation.c @@ -181,8 +181,9 @@ annotation_insert_error(struct annotation_info *annotation, unsigned offset, continue; if (offset + sizeof(brw_inst) != next->offset) { - memmove(next, cur, - (annotation->ann_count - i + 2) * sizeof(struct annotation)); + int count; + count = annotation->ann_count - i - 1; + memmove(next, cur, count * sizeof(struct annotation)); cur->error = NULL; cur->error_length = 0; cur->block_end = NULL; -- 2.14.2 _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
