[Mesa-dev] [PATCH 1/3] i965: Fix instanced geometry shaders on Gen8+.

[Kenneth Graunke]

On Saturday, April 04, 2015 03:05:11 PM Jordan Justen wrote:
> On 2015-04-04 03:46:31, Kenneth Graunke wrote:
> > Jordan added this in commit 741782b5948bb3d01d699f062a37513c2e73b076 for
> > Gen7 platforms.  Embarassingly, this was missed for well over a year.
> 
> :( I'm not sure why I didn't enable gen8 at the same time back then.
> 
> Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>

Yeah, that was my bad - I forgot to update it for your code, and
GL_ARB_gpu_shader5 wasn't turned on until much later.  No worries :)

> 
> > 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>
> > Cc: mesa-stable at lists.freedesktop.org
> > ---
> >  src/mesa/drivers/dri/i965/gen8_gs_state.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > Mini-series also available in the 'gen8sol' branch of ~kwg/mesa.
> > 
> > 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) |
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20150404/7d308723/attachment.sig>