[Mesa-dev] [PATCH] softpipe, llvmpipe: fix PIPE_SHADER_CAP_MAX_INPUTS value

[Brian Paul]

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

Want to reference bug 91099 in the commit msg?


On 06/24/2015 04:59 PM, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> PIPE_MAX_SHADER_INPUTS was recently bumped to 80 because of tessellation.
> ---
>   src/gallium/auxiliary/gallivm/lp_bld_limits.h | 2 +-
>   src/gallium/auxiliary/tgsi/tgsi_exec.h        | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/auxiliary/gallivm/lp_bld_limits.h b/src/gallium/auxiliary/gallivm/lp_bld_limits.h
> index 49064fe..050076e 100644
> --- a/src/gallium/auxiliary/gallivm/lp_bld_limits.h
> +++ b/src/gallium/auxiliary/gallivm/lp_bld_limits.h
> @@ -96,7 +96,7 @@ gallivm_get_shader_param(enum pipe_shader_cap param)
>      case PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH:
>         return LP_MAX_TGSI_NESTING;
>      case PIPE_SHADER_CAP_MAX_INPUTS:
> -      return PIPE_MAX_SHADER_INPUTS;
> +      return 32;
>      case PIPE_SHADER_CAP_MAX_OUTPUTS:
>         return 32;
>      case PIPE_SHADER_CAP_MAX_CONST_BUFFER_SIZE:
> diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.h b/src/gallium/auxiliary/tgsi/tgsi_exec.h
> index 208640c..e8ee256 100644
> --- a/src/gallium/auxiliary/tgsi/tgsi_exec.h
> +++ b/src/gallium/auxiliary/tgsi/tgsi_exec.h
> @@ -213,7 +213,7 @@ struct tgsi_sampler
>    * input register files, this is the stride between two 1D
>    * arrays.
>    */
> -#define TGSI_EXEC_MAX_INPUT_ATTRIBS PIPE_MAX_SHADER_INPUTS
> +#define TGSI_EXEC_MAX_INPUT_ATTRIBS 32
>
>   /* The maximum number of bytes per constant buffer.
>    */
>