On Wed, Apr 19, 2017 at 5:10 PM, Lyude <[email protected]> wrote: > Enables support for the ARB_vertex_shader_layer and > ARB_vertex_shader_layer_viewport_index extensions for the GM200.
There are no such extensions. There are AMD_bla bla extensions. Also, Nicolai recently added a new cap called PIPE_CAP_TGSI_TES_LAYER_VIEWPORT which you should enable as well -- this will flip on ARB_shader_layer_viewport Also, please make a note of these in the relnotes. > > Signed-off-by: Lyude <[email protected]> This patch looks awfully familiar... you sure it's from you? :p Perhaps reference that you got it from a trello, or just set me as the author (since I was). It'd be a little disingenuous for me to review my own patch but ... it looks great :) > --- > src/gallium/drivers/nouveau/nvc0/nvc0_context.h | 1 + > src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 2 +- > .../drivers/nouveau/nvc0/nvc0_shader_state.c | 26 > +++++++++++++++++----- > .../drivers/nouveau/nvc0/nvc0_state_validate.c | 3 +++ > 4 files changed, 26 insertions(+), 6 deletions(-) > > diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_context.h > b/src/gallium/drivers/nouveau/nvc0/nvc0_context.h > index 79a5333..bd6f752 100644 > --- a/src/gallium/drivers/nouveau/nvc0/nvc0_context.h > +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_context.h > @@ -312,6 +312,7 @@ void nvc0_fragprog_validate(struct nvc0_context *); > void nvc0_compprog_validate(struct nvc0_context *); > > void nvc0_tfb_validate(struct nvc0_context *); > +void nvc0_layer_validate(struct nvc0_context *); > > /* nvc0_state.c */ > extern void nvc0_init_state_functions(struct nvc0_context *); > diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c > b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c > index e82f869..626f801 100644 > --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c > +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c > @@ -258,6 +258,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum > pipe_cap param) > case PIPE_CAP_TGSI_FS_FBFETCH: > return class_3d >= NVE4_3D_CLASS; /* needs testing on fermi */ > case PIPE_CAP_POLYGON_MODE_FILL_RECTANGLE: > + case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT: > return class_3d >= GM200_3D_CLASS; > case PIPE_CAP_TGSI_BALLOT: > return class_3d >= NVE4_3D_CLASS; > @@ -270,7 +271,6 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum > pipe_cap param) > case PIPE_CAP_VERTEX_BUFFER_OFFSET_4BYTE_ALIGNED_ONLY: > case PIPE_CAP_VERTEX_BUFFER_STRIDE_4BYTE_ALIGNED_ONLY: > case PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY: > - case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT: > case PIPE_CAP_FAKE_SW_MSAA: > case PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION: > case PIPE_CAP_VERTEXID_NOBASE: > diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c > b/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c > index c644fe9..a8c814f 100644 > --- a/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c > +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c > @@ -220,18 +220,13 @@ nvc0_gmtyprog_validate(struct nvc0_context *nvc0) > > /* we allow GPs with no code for specifying stream output state only */ > if (gp && nvc0_program_validate(nvc0, gp) && gp->code_size) { > - const bool gp_selects_layer = !!(gp->hdr[13] & (1 << 9)); > - > BEGIN_NVC0(push, NVC0_3D(MACRO_GP_SELECT), 1); > PUSH_DATA (push, 0x41); > BEGIN_NVC0(push, NVC0_3D(SP_START_ID(4)), 1); > PUSH_DATA (push, gp->code_base); > BEGIN_NVC0(push, NVC0_3D(SP_GPR_ALLOC(4)), 1); > PUSH_DATA (push, gp->num_gprs); > - BEGIN_NVC0(push, NVC0_3D(LAYER), 1); > - PUSH_DATA (push, gp_selects_layer ? NVC0_3D_LAYER_USE_GP : 0); > } else { > - IMMED_NVC0(push, NVC0_3D(LAYER), 0); > BEGIN_NVC0(push, NVC0_3D(MACRO_GP_SELECT), 1); > PUSH_DATA (push, 0x40); > } > @@ -252,6 +247,27 @@ nvc0_compprog_validate(struct nvc0_context *nvc0) > } > > void > +nvc0_layer_validate(struct nvc0_context *nvc0) > +{ > + struct nouveau_pushbuf *push = nvc0->base.pushbuf; > + struct nvc0_program *last; > + bool prog_selects_layer = false; > + > + if (nvc0->gmtyprog) > + last = nvc0->gmtyprog; > + else if (nvc0->tevlprog) > + last = nvc0->tevlprog; > + else > + last = nvc0->vertprog; > + > + if (last) > + prog_selects_layer = !!(last->hdr[13] & (1 << 9)); > + > + BEGIN_NVC0(push, NVC0_3D(LAYER), 1); > + PUSH_DATA (push, prog_selects_layer ? NVC0_3D_LAYER_USE_GP : 0); > +} > + > +void > nvc0_tfb_validate(struct nvc0_context *nvc0) > { > struct nouveau_pushbuf *push = nvc0->base.pushbuf; > diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c > b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c > index 68fd730..6d3caa1 100644 > --- a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c > +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c > @@ -878,6 +878,9 @@ validate_list_3d[] = { > { nvc0_validate_buffers, NVC0_NEW_3D_BUFFERS }, > { nvc0_idxbuf_validate, NVC0_NEW_3D_IDXBUF }, > { nvc0_tfb_validate, NVC0_NEW_3D_TFB_TARGETS | > NVC0_NEW_3D_GMTYPROG }, > + { nvc0_layer_validate, NVC0_NEW_3D_VERTPROG | > + NVC0_NEW_3D_TEVLPROG | > + NVC0_NEW_3D_GMTYPROG }, > { nvc0_validate_driverconst, NVC0_NEW_3D_DRIVERCONST }, > }; > > -- > 2.9.3 > > _______________________________________________ > mesa-dev mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
