[Mesa-dev] [PATCH v3 11/12] nvc0: bump the maximum number of UBOs for compute on Kepler

[Ilia Mirkin]

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

On Fri, Apr 1, 2016 at 12:56 PM, Samuel Pitoiset
<samuel.pitoiset at gmail.com> wrote:
> The maximum number of uniform blocks (MAX_COMPUTE_UNIFORM_BLOCKS)
> per compute program must be at least 12.
>
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
>  src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 2 --
>  src/gallium/drivers/nouveau/nvc0/nvc0_screen.h | 1 -
>  2 files changed, 3 deletions(-)
>
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> index 8d7d4ef..ac7f57b 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> @@ -320,8 +320,6 @@ nvc0_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader,
>     case PIPE_SHADER_CAP_MAX_CONST_BUFFER_SIZE:
>        return 65536;
>     case PIPE_SHADER_CAP_MAX_CONST_BUFFERS:
> -      if (shader == PIPE_SHADER_COMPUTE && class_3d >= NVE4_3D_CLASS)
> -         return NVE4_MAX_PIPE_CONSTBUFS_COMPUTE;
>        return NVC0_MAX_PIPE_CONSTBUFS;
>     case PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR:
>        return shader != PIPE_SHADER_FRAGMENT;
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h
> index 46b692d..0f78220 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h
> @@ -16,7 +16,6 @@
>
>  /* doesn't count reserved slots (for auxiliary constants, immediates, etc.) */
>  #define NVC0_MAX_PIPE_CONSTBUFS         14
> -#define NVE4_MAX_PIPE_CONSTBUFS_COMPUTE  7
>
>  #define NVC0_MAX_SURFACE_SLOTS 16
>
> --
> 2.7.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev