[Mesa-dev] [PATCH 1/8] gallium: add vertex stream argument to EMIT/ENDPRIM

[Brian Paul]

On 06/26/2014 10:40 PM, Ilia Mirkin wrote:
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>   src/gallium/auxiliary/tgsi/tgsi_info.c     | 4 ++--
>   src/gallium/docs/source/tgsi.rst           | 8 ++++----
>   src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 ++--
>   3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c b/src/gallium/auxiliary/tgsi/tgsi_info.c
> index d03a920..e2c4e65 100644
> --- a/src/gallium/auxiliary/tgsi/tgsi_info.c
> +++ b/src/gallium/auxiliary/tgsi/tgsi_info.c
> @@ -134,8 +134,8 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
>      { 1, 2, 1, 0, 0, 0, OTHR, "TXF", TGSI_OPCODE_TXF },
>      { 1, 2, 1, 0, 0, 0, OTHR, "TXQ", TGSI_OPCODE_TXQ },
>      { 0, 0, 0, 0, 0, 0, NONE, "CONT", TGSI_OPCODE_CONT },
> -   { 0, 0, 0, 0, 0, 0, NONE, "EMIT", TGSI_OPCODE_EMIT },
> -   { 0, 0, 0, 0, 0, 0, NONE, "ENDPRIM", TGSI_OPCODE_ENDPRIM },
> +   { 0, 1, 0, 0, 0, 0, NONE, "EMIT", TGSI_OPCODE_EMIT },
> +   { 0, 1, 0, 0, 0, 0, NONE, "ENDPRIM", TGSI_OPCODE_ENDPRIM },
>      { 0, 0, 0, 1, 0, 1, NONE, "BGNLOOP", TGSI_OPCODE_BGNLOOP },
>      { 0, 0, 0, 0, 0, 1, NONE, "BGNSUB", TGSI_OPCODE_BGNSUB },
>      { 0, 0, 0, 1, 1, 0, NONE, "ENDLOOP", TGSI_OPCODE_ENDLOOP },
> diff --git a/src/gallium/docs/source/tgsi.rst b/src/gallium/docs/source/tgsi.rst
> index 2130e08..4213b4a 100644
> --- a/src/gallium/docs/source/tgsi.rst
> +++ b/src/gallium/docs/source/tgsi.rst
> @@ -1646,14 +1646,14 @@ in any other type of shader.
>
>   .. opcode:: EMIT - Emit
>
> -  Generate a new vertex for the current primitive using the values in the
> -  output registers.
> +  Generate a new vertex for the current primitive into the specified vertex
> +  stream using the values in the output registers.
>
>
>   .. opcode:: ENDPRIM - End Primitive
>
> -  Complete the current primitive (consisting of the emitted vertices),
> -  and start a new one.
> +  Complete the current primitive in the specified vertex stream (consisting of
> +  the emitted vertices), and start a new one.
>
>
>   GLSL ISA
> diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> index cac1e0f..b7218ef 100644
> --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> @@ -3139,14 +3139,14 @@ void
>   glsl_to_tgsi_visitor::visit(ir_emit_vertex *ir)
>   {
>      assert(this->prog->Target == GL_GEOMETRY_PROGRAM_NV);
> -   emit(ir, TGSI_OPCODE_EMIT);
> +   emit(ir, TGSI_OPCODE_EMIT, undef_dst, st_src_reg_for_int(0));
>   }
>
>   void
>   glsl_to_tgsi_visitor::visit(ir_end_primitive *ir)
>   {
>      assert(this->prog->Target == GL_GEOMETRY_PROGRAM_NV);
> -   emit(ir, TGSI_OPCODE_ENDPRIM);
> +   emit(ir, TGSI_OPCODE_ENDPRIM, undef_dst, st_src_reg_for_int(0));
>   }
>
>   glsl_to_tgsi_visitor::glsl_to_tgsi_visitor()
>

Reviewed-by: Brian Paul <brianp at vmware.com>