diff options
| author | Timothy Arceri <[email protected]> | 2017-04-30 12:12:35 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-05-01 07:54:18 +1000 |
| commit | de8e01698fb745e6f91c22470393777093c2c2ee (patch) | |
| tree | 4a8ff006d7f5b19da78c324f988a3948559dbbf5 | |
| parent | a5c6ca96025d8127263caea1d47b75a25ab33d5a (diff) | |
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 <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100871
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 || |