On Tuesday, January 10, 2017 9:06:08 AM PST Jason Ekstrand wrote:
> On Mon, Jan 9, 2017 at 11:37 PM, Kenneth Graunke <kenn...@whitecape.org>
> wrote:
>
> > v2: Use info->tess.
> >
> > Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
> > Reviewed-by: Dave Airlie <airl...@redhat.com> [v1]
> > Reviewed-by: Iago Toral Quiroga <ito...@igalia.com> [v1]
> > Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> [v1]
> > ---
> > src/compiler/spirv/spirv_to_nir.c | 45 ++++++++++++++++++++++++++++++
> > +++------
> > 1 file changed, 39 insertions(+), 6 deletions(-)
> >
> > diff --git a/src/compiler/spirv/spirv_to_nir.c
> > b/src/compiler/spirv/spirv_to_nir.c
> > index befee1a4b9b..8f662aa35e2 100644
> > --- a/src/compiler/spirv/spirv_to_nir.c
> > +++ b/src/compiler/spirv/spirv_to_nir.c
> > @@ -2753,8 +2753,12 @@ vtn_handle_execution_mode(struct vtn_builder *b,
> > struct vtn_value *entry_point,
> > break; /* Nothing to do with this */
> >
> > case SpvExecutionModeOutputVertices:
> > - assert(b->shader->stage == MESA_SHADER_GEOMETRY);
> > - b->shader->info->gs.vertices_out = mode->literals[0];
> > + if (b->shader->stage == MESA_SHADER_TESS_CTRL) {
> >
>
> Is this only allowed in TCS? Just double-checking...
In a sensible world, yes, but with SPIR-V? Nope. I'll fix it to check
for either stage. Thanks!
> > + b->shader->info->tess.tcs_vertices_out = mode->literals[0];
> > + } else {
> > + assert(b->shader->stage == MESA_SHADER_GEOMETRY);
> > + b->shader->info->gs.vertices_out = mode->literals[0];
> > + }
> > break;
> >
> > case SpvExecutionModeInputPoints:
> > @@ -2764,11 +2768,13 @@ vtn_handle_execution_mode(struct vtn_builder *b,
> > struct vtn_value *entry_point,
> > case SpvExecutionModeInputTrianglesAdjacency:
> > case SpvExecutionModeQuads:
> > case SpvExecutionModeIsolines:
> > - if (b->shader->stage == MESA_SHADER_GEOMETRY) {
> > + if (b->shader->stage == MESA_SHADER_TESS_EVAL) {
> >
>
> Same question here only TES.
Will fix this as well.
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
