i965: Don't allocate uniform space for samplers
authorTimothy Arceri <tarceri@itsqueeze.com>
Sun, 30 Apr 2017 02:12:35 +0000 (12:12 +1000)
committerTimothy Arceri <tarceri@itsqueeze.com>
Sun, 30 Apr 2017 21:54:18 +0000 (07:54 +1000)
commitde8e01698fb745e6f91c22470393777093c2c2ee
tree4a8ff006d7f5b19da78c324f988a3948559dbbf5
parenta5c6ca96025d8127263caea1d47b75a25ab33d5a
i965: Don't allocate uniform space for samplers

Samplers are encoded into the instruction word, so there's no need to
make space in the uniform file.

Previously matrix_columns and vector_elements were set to 0, making this
else case a no-op. Commit 75a31a20af26 changed that, causing malloc
corruption in thousands of tests on i965.

Fixes: 75a31a20af26 ("glsl: set vector_elements to 1 for samplers")
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100871
src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp