i965/fs: Fix regression with SIMD8 VS since b5f1a48e23.

With num_direct_uniforms == 0 there's no space allocated in the
param_size array for the one block of direct uniforms -- On the FS
stage this would be a harmless no-op because it would simply re-set
one of the param_size entries allocated for the sampler units to zero,
but on the VS stage it has been reported to cause memory corruption
followed by a crash -- Surprising how a full piglit run on Gen8 didn't
catch it.

Reported-and-reviewed-by: "Lofstedt, Marta" <marta.lofstedt@intel.com>
This commit is contained in:
Francisco Jerez 2015-07-30 14:45:57 +03:00
parent 383558c564
commit 781dc7c0e1

View file

@ -182,7 +182,8 @@ fs_visitor::nir_setup_uniforms(nir_shader *shader)
/* We split the uniform register file in half. The first half is
* entirely direct uniforms. The second half is indirect.
*/
param_size[0] = num_direct_uniforms;
if (num_direct_uniforms > 0)
param_size[0] = num_direct_uniforms;
if (shader->num_uniforms > num_direct_uniforms)
param_size[num_direct_uniforms] = shader->num_uniforms - num_direct_uniforms;