[Nouveau] [PATCH 3/3] nv50/ir: Remove NV50_SEMANTIC_VIEWPORTINDEX and its last consumer

[Ilia Mirkin]

On Sat, Jun 14, 2014 at 10:41 AM, Tobias Klausmann
<tobias.johannes.klausmann at mni.thm.de> wrote:
> We use TGSI_SEMANTIC_VIEWPORT_INDEX for nvc0 now as well.
>
> Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
> ---
>  src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h        | 1 -
>  src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp | 1 -
>  2 files changed, 2 deletions(-)
>
> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h
> index f829aac..c885c8c 100644
> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h
> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h
> @@ -70,7 +70,6 @@ struct nv50_ir_varying
>  #endif
>
>  #define NV50_SEMANTIC_CLIPDISTANCE  (TGSI_SEMANTIC_COUNT + 0)
> -#define NV50_SEMANTIC_VIEWPORTINDEX (TGSI_SEMANTIC_COUNT + 4)
>  #define NV50_SEMANTIC_TESSFACTOR    (TGSI_SEMANTIC_COUNT + 7)
>  #define NV50_SEMANTIC_TESSCOORD     (TGSI_SEMANTIC_COUNT + 8)
>  #define NV50_SEMANTIC_COUNT         (TGSI_SEMANTIC_COUNT + 10)
> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp
> index abadc7f..7e314aa 100644
> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp
> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp
> @@ -538,7 +538,6 @@ recordLocation(uint16_t *locs, uint8_t *masks,
>     case TGSI_SEMANTIC_VERTEXID: locs[SV_VERTEX_ID] = addr; break;
>     case TGSI_SEMANTIC_PRIMID: locs[SV_PRIMITIVE_ID] = addr; break;
>     case TGSI_SEMANTIC_LAYER: locs[SV_LAYER] = addr; break;
> -   case NV50_SEMANTIC_VIEWPORTINDEX: locs[SV_VIEWPORT_INDEX] = addr; break;

I know this goes against what I said earlier, but actually do you mind
flipping this over to TGSI_SEMANTIC_VIEWPORT_INDEX -- I suspect when
ARB_fragment_layer_viewport is implemented, layer/viewport might be
system values in the fragment shader.

  -ilia