From 0f06864ba566eaff5b739a9d0fba5ed7eaadd60b Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 29 Nov 2012 16:51:13 -0800 Subject: [PATCH] i965: Don't leak the IR annotation into later instructions. After walking our IR instructions (Mesa or GLSL), we don't want to also mark the start of the FB/URB writes or whatever as being that IR. This can end up being misleading when the end of the IR visit got copy propagated out to a later instruction in the URB writes. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_fs.cpp | 1 + src/mesa/drivers/dri/i965/brw_vec4.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index ee3b7fd9be6..b777172c239 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -2158,6 +2158,7 @@ fs_visitor::run() } else { emit_fragment_program_code(); } + base_ir = NULL; if (failed) return false; diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp index 34c34d79399..1a199d6e822 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp @@ -1052,6 +1052,7 @@ vec4_visitor::run() } else { emit_vertex_program_code(); } + base_ir = NULL; if (c->key.userclip_active && !c->key.uses_clip_distance) setup_uniform_clipplane_values(); -- 2.30.2