From 07ee9f374f2946f852896e9264c7fa83eafc3f16 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 23 Dec 2011 20:24:46 -0800 Subject: [PATCH] i965/vs: Properly clear cur_value when propagating direct copies. Consider the following code: MOV A.x, B.x MOV B.x, C.x After the first line, cur_value[A][0] == B, indicating that A.x's current value came from register B. When processing the second line, we update cur_value[B][0] to C. However, for drect copies, we fail to reset cur_value[A][0] to NULL. This is necessary because the value of A is no longer the value of B. Fixes Counter-Strike: Source in Wine (where the menu rendered completely black in DX9 mode), completely white textures in Civilization V, and the new Piglit test glsl-vs-copy-propagation-1.shader_test. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=42032 Tested-by: Matt Turner Tested-by: Christopher James Halse Rogers Reviewed-by: Eric Anholt Signed-off-by: Kenneth Graunke --- .../dri/i965/brw_vec4_copy_propagation.cpp | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp index 95aa30614b1..08d8f5b7034 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp @@ -297,30 +297,26 @@ vec4_visitor::opt_copy_propagation() } /* Track available source registers. */ - if (is_direct_copy(inst)) { - int reg = virtual_grf_reg_map[inst->dst.reg] + inst->dst.reg_offset; - for (int i = 0; i < 4; i++) { - if (inst->dst.writemask & (1 << i)) { - cur_value[reg][i] = &inst->src[0]; - } + const int reg = virtual_grf_reg_map[inst->dst.reg] + inst->dst.reg_offset; + + /* Update our destination's current channel values. For a direct copy, + * the value is the newly propagated source. Otherwise, we don't know + * the new value, so clear it. + */ + bool direct_copy = is_direct_copy(inst); + for (int i = 0; i < 4; i++) { + if (inst->dst.writemask & (1 << i)) { + cur_value[reg][i] = direct_copy ? &inst->src[0] : NULL; } - continue; } - /* For any updated channels, clear tracking of them as a source - * or destination. + /* Clear the records for any registers whose current value came from + * our destination's updated channels, as the two are no longer equal. */ if (inst->dst.file == GRF) { if (inst->dst.reladdr) memset(cur_value, 0, sizeof(cur_value)); else { - int reg = virtual_grf_reg_map[inst->dst.reg] + inst->dst.reg_offset; - - for (int i = 0; i < 4; i++) { - if (inst->dst.writemask & (1 << i)) - cur_value[reg][i] = NULL; - } - for (int i = 0; i < virtual_grf_reg_count; i++) { for (int j = 0; j < 4; j++) { if (inst->dst.writemask & (1 << j) && -- 2.30.2