From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 20 Jun 2018 23:11:08 +0000 (-0700)
Subject: iris: actually init num_viewports
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f12b079c0ed5d02413f43abe39380e47d6874b74;p=mesa.git

iris: actually init num_viewports

fixes regressions
---

diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c
index 136b1c388df..b4bfb45ec4c 100644
--- a/src/gallium/drivers/iris/iris_program.c
+++ b/src/gallium/drivers/iris/iris_program.c
@@ -452,7 +452,9 @@ update_last_vue_map(struct iris_context *ice)
       // XXX: could use ctx->Const.MaxViewports for old API efficiency
       ice->state.num_viewports =
          (vue_map->slots_valid & VARYING_BIT_VIEWPORT) ? IRIS_MAX_VIEWPORTS : 1;
-      ice->state.dirty |= IRIS_DIRTY_CLIP | IRIS_DIRTY_SF_CL_VIEWPORT;
+      ice->state.dirty |= IRIS_DIRTY_CLIP |
+                          IRIS_DIRTY_SF_CL_VIEWPORT |
+                          IRIS_DIRTY_SCISSOR_RECT;
       // XXX: CC_VIEWPORT?
    }
 
diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 8fd0ad83b94..d35bcd4eb28 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -3343,6 +3343,7 @@ genX(init_state)(struct iris_context *ice)
 
    ice->state.dirty = ~0ull;
 
+   ice->state.num_viewports = 1;
    ice->state.cso_vp = calloc(1, sizeof(struct iris_viewport_state));
    ice->state.cso_vertex_buffers =
       calloc(1, sizeof(struct iris_vertex_buffer_state));