From: Timothy Arceri Date: Sun, 30 Apr 2017 02:12:35 +0000 (+1000) Subject: i965: Don't allocate uniform space for samplers X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=de8e01698fb745e6f91c22470393777093c2c2ee;p=mesa.git 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 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100871 --- diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp index f35e8f88dd2..f0bccac14ef 100644 --- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp +++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp @@ -135,7 +135,7 @@ brw_nir_setup_glsl_uniform(gl_shader_stage stage, nir_variable *var, struct gl_uniform_storage *storage = &prog->sh.data->UniformStorage[u]; - if (storage->builtin) + if (storage->builtin || storage->type->is_sampler()) continue; if (strncmp(var->name, storage->name, namelen) != 0 ||