commit 73b1570dc1959d7efe2512db956a98925a90fddb
author Ilia Mirkin <imirkin@alum.mit.edu> Wed Jan 25 23:06:22 2017 -0500
committer Emil Velikov <emil.l.velikov@gmail.com> Fri Feb 10 11:14:14 2017 +0000
tree 3bbfaaed9bbed7b4093e6df6e05708fa3bf584bf
parent 06128bdc212778f0471f65a421cf2a1df3616ff8

nvc0: increase number of ubo binding points

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@alum.mit.edu>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Cc: mesa-stable@lists.freedesktop.org
(cherry picked from commit 59ca352fc573a37f9f70c1f6217e85dd3e31d38e)

src/gallium/drivers/nouveau/nvc0/nvc0_screen.h

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 @@
    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];