AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Use VARYING_SLOT_TESS_MAX to size indirect bitmasks

Browse Source 
MAX_VARYINGS_INCL_PATCH subtracts VARYING_SLOT_VAR0 giving us a size
that's too small, so BITSET_SET writes words out of bounds, corrupting
the stack and causing all kinds of chaos.  VARYING_SLOT_TESS_MAX is
the right value to use here, as it's the largest location.

Closes: 2002
Fixes: ee2050b111 ("nir: Use BITSET for tracking varyings in lower_io_arrays")
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
This commit is contained in:
Kenneth Graunke
2019-10-25 11:18:52 -07:00
committed by Kristian H. Kristensen
parent e919c44c3b
commit f306d07932
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/nir/nir_lower_io_arrays_to_elements.c
+2 -2
View File
@@ -349,7 +349,7 @@ nir_lower_io_arrays_to_elements_no_indirects(nir_shader *shader,
struct hash_table *split_inputs = _mesa_pointer_hash_table_create(NULL);
struct hash_table *split_outputs = _mesa_pointer_hash_table_create(NULL);
BITSET_DECLARE(indirects, 4 * MAX_VARYINGS_INCL_PATCH) = {};
BITSET_DECLARE(indirects, 4 * VARYING_SLOT_TESS_MAX) = {};
lower_io_arrays_to_elements(shader, nir_var_shader_out,
indirects, split_outputs, true);
@@ -387,7 +387,7 @@ nir_lower_io_arrays_to_elements(nir_shader *producer, nir_shader *consumer)
struct hash_table *split_inputs = _mesa_pointer_hash_table_create(NULL);
struct hash_table *split_outputs = _mesa_pointer_hash_table_create(NULL);
BITSET_DECLARE(indirects, 4 * MAX_VARYINGS_INCL_PATCH) = {};
BITSET_DECLARE(indirects, 4 * VARYING_SLOT_TESS_MAX) = {};
create_indirects_mask(producer, indirects, nir_var_shader_out);
create_indirects_mask(consumer, indirects, nir_var_shader_in);