On 12/04/2017 12:12 PM, Antia Puentes wrote: > This VS system value will contain the value passed as <basevertex> > for indexed draw calls or the value passed as <first> for non-indexed > draw calls. It will be used to calculate the gl_VertexID as > SYSTEM_VALUE_VERTEX_ID_ZERO_BASE plus SYSTEM_VALUE_FIRST_VERTEX. > Note that the current calculation which uses SYSTEM_VALUE_BASE_VERTEX > is not right, as gl_BaseVertex should be zero for non-indexed calls. > > v2: use SYSTEM_VALUE_FIRST_VERTEX as name for the value, instead of > SYSTEM_VALUE_BASE_VERTEX_ID (Kenneth). > > Reviewed-by: Neil Roberts <nrobe...@igalia.com> > Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> > --- > src/compiler/nir/nir.c | 4 ++++ > src/compiler/nir/nir_gather_info.c | 1 + > src/compiler/nir/nir_intrinsics.h | 1 + > src/compiler/shader_enums.c | 1 + > src/compiler/shader_enums.h | 15 +++++++++++++++ > 5 files changed, 22 insertions(+) > > diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c > index 7380bf436a8..29730f5fa86 100644 > --- a/src/compiler/nir/nir.c > +++ b/src/compiler/nir/nir.c > @@ -1913,6 +1913,8 @@ nir_intrinsic_from_system_value(gl_system_value val) > return nir_intrinsic_load_base_instance; > case SYSTEM_VALUE_VERTEX_ID_ZERO_BASE: > return nir_intrinsic_load_vertex_id_zero_base; > + case SYSTEM_VALUE_FIRST_VERTEX: > + return nir_intrinsic_load_first_vertex; > case SYSTEM_VALUE_BASE_VERTEX: > return nir_intrinsic_load_base_vertex; > case SYSTEM_VALUE_INVOCATION_ID: > @@ -1982,6 +1984,8 @@ nir_system_value_from_intrinsic(nir_intrinsic_op intrin) > return SYSTEM_VALUE_BASE_INSTANCE; > case nir_intrinsic_load_vertex_id_zero_base: > return SYSTEM_VALUE_VERTEX_ID_ZERO_BASE; > + case nir_intrinsic_load_first_vertex: > + return SYSTEM_VALUE_FIRST_VERTEX; > case nir_intrinsic_load_base_vertex: > return SYSTEM_VALUE_BASE_VERTEX; > case nir_intrinsic_load_invocation_id: > diff --git a/src/compiler/nir/nir_gather_info.c > b/src/compiler/nir/nir_gather_info.c > index 946939657ec..555ae77b1d3 100644 > --- a/src/compiler/nir/nir_gather_info.c > +++ b/src/compiler/nir/nir_gather_info.c > @@ -247,6 +247,7 @@ gather_intrinsic_info(nir_intrinsic_instr *instr, > nir_shader *shader) > case nir_intrinsic_load_vertex_id: > case nir_intrinsic_load_vertex_id_zero_base: > case nir_intrinsic_load_base_vertex: > + case nir_intrinsic_load_first_vertex: > case nir_intrinsic_load_base_instance: > case nir_intrinsic_load_instance_id: > case nir_intrinsic_load_sample_id: > diff --git a/src/compiler/nir/nir_intrinsics.h > b/src/compiler/nir/nir_intrinsics.h > index 20bef339ac4..a7770bf6a85 100644 > --- a/src/compiler/nir/nir_intrinsics.h > +++ b/src/compiler/nir/nir_intrinsics.h > @@ -326,6 +326,7 @@ SYSTEM_VALUE(frag_coord, 4, 0, xx, xx, xx) > SYSTEM_VALUE(front_face, 1, 0, xx, xx, xx) > SYSTEM_VALUE(vertex_id, 1, 0, xx, xx, xx) > SYSTEM_VALUE(vertex_id_zero_base, 1, 0, xx, xx, xx) > +SYSTEM_VALUE(first_vertex, 1, 0, xx, xx, xx) > SYSTEM_VALUE(base_vertex, 1, 0, xx, xx, xx) > SYSTEM_VALUE(instance_id, 1, 0, xx, xx, xx) > SYSTEM_VALUE(base_instance, 1, 0, xx, xx, xx) > diff --git a/src/compiler/shader_enums.c b/src/compiler/shader_enums.c > index 2179c475abd..5e123f29f37 100644 > --- a/src/compiler/shader_enums.c > +++ b/src/compiler/shader_enums.c > @@ -214,6 +214,7 @@ gl_system_value_name(gl_system_value sysval) > ENUM(SYSTEM_VALUE_INSTANCE_ID), > ENUM(SYSTEM_VALUE_INSTANCE_INDEX), > ENUM(SYSTEM_VALUE_VERTEX_ID_ZERO_BASE), > + ENUM(SYSTEM_VALUE_FIRST_VERTEX), > ENUM(SYSTEM_VALUE_BASE_VERTEX), > ENUM(SYSTEM_VALUE_BASE_INSTANCE), > ENUM(SYSTEM_VALUE_DRAW_ID), > diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h > index ffe551ab20f..76bb2cc4203 100644 > --- a/src/compiler/shader_enums.h > +++ b/src/compiler/shader_enums.h > @@ -472,6 +472,21 @@ typedef enum > */ > SYSTEM_VALUE_BASE_VERTEX, > > +
Delete this blank line. > + /** > + * Depending on the type of the draw call (indexed or non-indexed), > + * is the value of \c basevertex passed to \c glDrawElementsBaseVertex and > + * similar, or is the value of \c first passed to \c glDrawArrays and > + * similar. > + * > + * \note > + * It can be used to calculate the \c SYSTEM_VALUE_VERTEX_ID as > + * \c SYSTEM_VALUE_VERTEX_ID_ZERO_BASE plus \c SYSTEM_VALUE_FIRST_VERTEX. > + * > + * \sa SYSTEM_VALUE_VERTEX_ID_ZERO_BASE, SYSTEM_VALUE_VERTEX_ID > + */ > + SYSTEM_VALUE_FIRST_VERTEX, > + > /** > * Value of \c baseinstance passed to instanced draw entry points > * > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
