From 32182bb004923c8746803aa88d4b4505e4124b8c Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 16 Oct 2013 12:39:07 -0700 Subject: [PATCH] i965/fs: Fix register unspills from a reg_offset. We were clearing the reg_offset before trying to use it. Oops. Fixes glsl-fs-texture2drect with the reg spilling debug enabled. Reviewed-by: Paul Berry --- src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp index 64fb78b6bdd..0102b2ee8cd 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp @@ -677,13 +677,13 @@ fs_visitor::spill_reg(int spill_reg) if (inst->src[i].file == GRF && inst->src[i].reg == spill_reg) { int regs_read = inst->regs_read(this, i); + int subset_spill_offset = (spill_offset + + reg_size * inst->src[i].reg_offset); inst->src[i].reg = virtual_grf_alloc(regs_read); inst->src[i].reg_offset = 0; - emit_unspill(inst, inst->src[i], - spill_offset + reg_size * inst->src[i].reg_offset, - regs_read); + emit_unspill(inst, inst->src[i], subset_spill_offset, regs_read); } } -- 2.30.2