diff --git a/.pick_status.json b/.pick_status.json
index 3c5783f5097..f175404a9f8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2272,7 +2272,7 @@
         "description": "anv: emit sample mask state independent of fragment stage",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "9f6af43743d3dfed018e384e056da3b587d5f46d"
     },
diff --git a/src/intel/vulkan/gfx8_cmd_buffer.c b/src/intel/vulkan/gfx8_cmd_buffer.c
index 60a9945e804..75e3531cd79 100644
--- a/src/intel/vulkan/gfx8_cmd_buffer.c
+++ b/src/intel/vulkan/gfx8_cmd_buffer.c
@@ -257,13 +257,9 @@ genX(cmd_emit_te)(struct anv_cmd_buffer *cmd_buffer)
 static void
 genX(cmd_emit_sample_mask)(struct anv_cmd_buffer *cmd_buffer)
 {
-   struct anv_graphics_pipeline *pipeline = cmd_buffer->state.gfx.pipeline;
    const struct vk_dynamic_graphics_state *dyn =
       &cmd_buffer->vk.dynamic_graphics_state;
 
-   if (!anv_pipeline_has_stage(pipeline, MESA_SHADER_FRAGMENT))
-      return;
-
    /* From the Vulkan 1.0 spec:
    *    If pSampleMask is NULL, it is treated as if the mask has all bits
     *    enabled, i.e. no coverage is removed from fragments.