diff --git a/.pick_status.json b/.pick_status.json
index 7c65e4abb4f..aa21b670c4e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -67,7 +67,7 @@
         "description": "r300: fix unconditional KIL on R300/R400",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "a8e1e5b5c2aeb7c2fb4eff2203a026090f0853b9"
     },
diff --git a/src/gallium/drivers/r300/compiler/radeon_dataflow_swizzles.c b/src/gallium/drivers/r300/compiler/radeon_dataflow_swizzles.c
index cf304db3611..cea7f859b67 100644
--- a/src/gallium/drivers/r300/compiler/radeon_dataflow_swizzles.c
+++ b/src/gallium/drivers/r300/compiler/radeon_dataflow_swizzles.c
@@ -580,6 +580,7 @@ void rc_dataflow_swizzles(struct radeon_compiler * c, void *user)
 			}
 			if (!c->is_r500 &&
 			    c->Program.Constants.Count < R300_PFS_NUM_CONST_REGS &&
+			    (!opcode->HasTexture && inst->U.I.Opcode != RC_OPCODE_KIL) &&
 			    try_rewrite_constant(c, reg)) {
 				continue;
 			}