From: Kenneth Graunke <kenneth@whitecape.org>
Date: Sat, 20 Jan 2018 09:09:36 +0000 (-0800)
Subject: iris: draw->restart_index is uninitialized if PR is not enabled
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d62b0b9ee8016662687287baa8710f24859a74d0;p=mesa.git

iris: draw->restart_index is uninitialized if PR is not enabled
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 1ec34bddbcb..03c42b7d777 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -1439,8 +1439,10 @@ iris_upload_render_state(struct iris_context *ice,
 
    if (1) {
       iris_emit_cmd(batch, GENX(3DSTATE_VF), vf) {
-         vf.IndexedDrawCutIndexEnable = draw->primitive_restart;
-         vf.CutIndex = draw->restart_index;
+         if (draw->primitive_restart) {
+            vf.IndexedDrawCutIndexEnable = true;
+            vf.CutIndex = draw->restart_index;
+         }
       }
    }