From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 15 Oct 2018 16:29:06 +0000 (-0700)
Subject: i965: Drop assert about number of uniforms in ARB handling.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=18cc65edf8480bc83685b3665c8c5268b1da79e6;p=mesa.git

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@jlekstrand.net>
---

diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
index 35416a74b9c..66cdc1a10b6 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