diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index 1ed9a2f5bfa..ea5868dee18 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -1023,8 +1023,10 @@ llvmpipe_update_fs(struct llvmpipe_context *lp)
    shader->current = variant;
 
    /* TODO: put this in the variant */
+   /* TODO: most of these can be relaxed, in particular the colormask */
    opaque = !key.blend.logicop_enable &&
             !key.blend.blend_enable &&
+            key.blend.colormask == 0xf &&
             !key.alpha.enabled &&
             !key.depth.enabled &&
             !shader->info.uses_kill