[Mesa-dev] [PATCH 2/2] r600g: Make number of tex indirections shader type specific again.

[Alex Deucher]

On Thu, Sep 16, 2010 at 9:27 AM, Tilman Sauerbeck <tilman at code-monkey.de> wrote:
> Commit a508d2dddcc67d0f92cc36b9ed6f36a9bbfc579d removed the type specific
> limit.
>
> Signed-off-by: Tilman Sauerbeck <tilman at code-monkey.de>
> ---
>
> I have no idea whether this is actually correct or not. Please review ;)
>

Since the shaders are unified, the limits are the same regardless of
the shader type.

Alex

>  src/gallium/drivers/r600/r600_screen.c |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/src/gallium/drivers/r600/r600_screen.c b/src/gallium/drivers/r600/r600_screen.c
> index 60e6d9a..fc68cf6 100644
> --- a/src/gallium/drivers/r600/r600_screen.c
> +++ b/src/gallium/drivers/r600/r600_screen.c
> @@ -129,8 +129,12 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, e
>        case PIPE_SHADER_CAP_MAX_INSTRUCTIONS:
>        case PIPE_SHADER_CAP_MAX_ALU_INSTRUCTIONS:
>        case PIPE_SHADER_CAP_MAX_TEX_INSTRUCTIONS:
> -       case PIPE_SHADER_CAP_MAX_TEX_INDIRECTIONS:
>                return 16384;
> +       case PIPE_SHADER_CAP_MAX_TEX_INDIRECTIONS:
> +               if (shader == PIPE_SHADER_FRAGMENT)
> +                       return 2048;
> +               else
> +                       return 16384;
>        case PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH:
>                return 8; /* FIXME */
>        case PIPE_SHADER_CAP_MAX_INPUTS:
> --
> 1.7.2.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>