[Mesa-stable] [Mesa-dev] [PATCH 1/2] nv50/ir: fix prog info init

[Samuel Pitoiset]

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

On 05/21/2016 10:18 PM, Ilia Mirkin wrote:
> Left over from the pre-mainline tess support. Adapt to use the new
> defines.
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> Cc: "11.1 11.2" <mesa-stable at lists.freedesktop.org>
> ---
>  src/gallium/drivers/nouveau/codegen/nv50_ir.cpp | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
> index c95aacf..35cd721 100644
> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
> @@ -1170,12 +1170,10 @@ extern "C" {
>  static void
>  nv50_ir_init_prog_info(struct nv50_ir_prog_info *info)
>  {
> -#if defined(PIPE_SHADER_HULL) && defined(PIPE_SHADER_DOMAIN)
> -   if (info->type == PIPE_SHADER_HULL || info->type == PIPE_SHADER_DOMAIN) {
> +   if (info->type == PIPE_SHADER_TESS_CTRL || info->type == PIPE_SHADER_TESS_EVAL) {
>        info->prop.tp.domain = PIPE_PRIM_MAX;
>        info->prop.tp.outputPrim = PIPE_PRIM_MAX;
>     }
> -#endif
>     if (info->type == PIPE_SHADER_GEOMETRY) {
>        info->prop.gp.instanceCount = 1;
>        info->prop.gp.maxVertices = 1;
>