diff --git a/.pick_status.json b/.pick_status.json
index e5f04612b31..da86515e8b2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1057,7 +1057,7 @@
         "description": "r600/sfn: Initialize VertexStageExportForGS m_num_clip_dist member variable.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "f7df2c57a207a386ba0d2130541ac9d0546670e1"
     },
diff --git a/src/gallium/drivers/r600/sfn/sfn_vertexstageexport.cpp b/src/gallium/drivers/r600/sfn/sfn_vertexstageexport.cpp
index 08c778a2e10..5facf07db12 100644
--- a/src/gallium/drivers/r600/sfn/sfn_vertexstageexport.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_vertexstageexport.cpp
@@ -382,6 +382,7 @@ bool VertexStageExportForFS::emit_stream(int stream)
 VertexStageExportForGS::VertexStageExportForGS(VertexStage &proc,
                                                const r600_shader *gs_shader):
    VertexStageExportBase(proc),
+   m_num_clip_dist(0),
    m_gs_shader(gs_shader)
 {