Mesa (master): i965: Fix instanced geometry shaders on Gen8+.

[Kenneth Graunke]

Module: Mesa
Branch: master
Commit: f9e5dc0a85df8dbfb8213ff772dfeb218972db12
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9e5dc0a85df8dbfb8213ff772dfeb218972db12

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Sat Apr  4 02:00:52 2015 -0700

i965: Fix instanced geometry shaders on Gen8+.

Jordan added this in commit 741782b5948bb3d01d699f062a37513c2e73b076 for
Gen7 platforms.  I missed this when adding the Broadwell code.

Fixes Piglit's spec/arb_gpu_shader5/invocation-id-{basic,in-separate-gs}
with MESA_EXTENSION_OVERRIDE=GL_ARB_gpu_shader5 set.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
Cc: mesa-stable at lists.freedesktop.org

---

 src/mesa/drivers/dri/i965/gen8_gs_state.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mesa/drivers/dri/i965/gen8_gs_state.c b/src/mesa/drivers/dri/i965/gen8_gs_state.c
index 95cc123..46b9713 100644
--- a/src/mesa/drivers/dri/i965/gen8_gs_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_gs_state.c
@@ -82,6 +82,8 @@ gen8_upload_gs_state(struct brw_context *brw)
       uint32_t dw7 = (brw->gs.prog_data->control_data_header_size_hwords <<
                       GEN7_GS_CONTROL_DATA_HEADER_SIZE_SHIFT) |
                       brw->gs.prog_data->dispatch_mode |
+                     ((brw->gs.prog_data->invocations - 1) <<
+                      GEN7_GS_INSTANCE_CONTROL_SHIFT) |
                       GEN6_GS_STATISTICS_ENABLE |
                       (brw->gs.prog_data->include_primitive_id ?
                        GEN7_GS_INCLUDE_PRIMITIVE_ID : 0) |