[Mesa-dev] [PATCH] nvc0: increase number of ubo binding points

[Samuel Pitoiset]

You are lucky, this fits in the driver cb without changing anything. :-)

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

On 01/26/2017 05:12 AM, Ilia Mirkin wrote:
> Apparently GL 4.5 requires 14 of these (there's a "*" in the spec, but
> it's unclear what it refers to). We need to expose an extra binding
> point for the "program parameters", which means this must be 15. Remove
> the last vestige of the "use c14 for immediates" idea.
>
> Fixes GL45-CTS.shading_language_420pack.binding_uniform_block_array
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>  src/gallium/drivers/nouveau/nvc0/nvc0_screen.h | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h
> index a6d4a2b..9e0211b 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h
> @@ -14,8 +14,8 @@
>  #define NVC0_TIC_MAX_ENTRIES 2048
>  #define NVC0_TSC_MAX_ENTRIES 2048
>
> -/* doesn't count reserved slots (for auxiliary constants, immediates, etc.) */
> -#define NVC0_MAX_PIPE_CONSTBUFS         14
> +/* doesn't count driver-reserved slot */
> +#define NVC0_MAX_PIPE_CONSTBUFS         15
>
>  #define NVC0_MAX_SURFACE_SLOTS 16
>
> @@ -50,7 +50,6 @@ struct nvc0_graph_state {
>     uint8_t num_textures[6];
>     uint8_t num_samplers[6];
>     uint8_t tls_required; /* bitmask of shader types using l[] */
> -   uint8_t c14_bound; /* whether immediate array constbuf is bound */
>     uint8_t clip_enable;
>     uint32_t clip_mode;
>     uint32_t uniform_buffer_bound[6];
>