i965/vec4: Use the uniform count from nir_assign_var_locations
authorJason Ekstrand <jason.ekstrand@intel.com>
Wed, 30 Sep 2015 20:11:23 +0000 (13:11 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Fri, 2 Oct 2015 21:19:39 +0000 (14:19 -0700)
commit390b48fc4a9836b563560581fbfb4833546de0c8
tree20b2ecdca2dffbafaf799e3dd9f1dbe497a1033a
parent3de81508ea513bf01f2c996c25a2cfdb5b3231d0
i965/vec4: Use the uniform count from nir_assign_var_locations

Previously, we were counting up uniforms as we set them up.  However, this
count should be exactly identical to shader->num_uniforms provided by
nir_assign_var_locations.  (If it's not, we're in trouble anyway because
that means that locations don't match up.)  This matches what the fs
backend is already doing.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp