Mesa (master): i965: Drop assert about number of uniforms in ARB handling.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 18cc65edf8480bc83685b3665c8c5268b1da79e6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=18cc65edf8480bc83685b3665c8c5268b1da79e6

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Oct 15 09:29:06 2018 -0700

i965: Drop assert about number of uniforms in ARB handling.

My recent prog_to_nir patch started making new sampler uniforms, which
apparently increased the number of parameters.  We used to poke at the
one parameter directly, making it important that there was only one,
but we haven't done that in a while.  It should be safe to just delete
the assertion.

Fixes: 1c0f92d8a8c "nir: Create sampler variables in prog_to_nir."
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
index 35416a74b9..66cdc1a10b 100644
--- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
+++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
@@ -246,10 +246,9 @@ brw_nir_setup_arb_uniforms(void *mem_ctx, nir_shader *shader,
    stage_prog_data->param = rzalloc_array(mem_ctx, uint32_t, nr_params);
 
    /* For ARB programs, prog_to_nir generates a single "parameters" variable
-    * for all uniform data.  nir_lower_wpos_ytransform may also create an
-    * additional variable.
+    * for all uniform data.  There may be additional sampler variables, and
+    * an extra uniform from nir_lower_wpos_ytransform.
     */
-   assert(shader->uniforms.length() <= 2);
 
    for (unsigned p = 0; p < plist->NumParameters; p++) {
       /* Parameters should be either vec4 uniforms or single component