nir: Delete nir_shader::user_structures and num_user_structures.

Nothing actually uses these, and the only caller of glsl_to_nir()
(brw_fs_nir.cpp) always passes NULL for the _mesa_glsl_parse_state
pointer, meaning they'll always be NULL and 0, respectively.

Just delete them.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
This commit is contained in:
Kenneth Graunke 2015-03-06 00:26:25 -08:00
parent 9f1e250e77
commit 2561aea6b3
4 changed files with 0 additions and 22 deletions

View File

@ -154,17 +154,6 @@ glsl_to_nir(exec_list *ir, _mesa_glsl_parse_state *state,
nir_shader *shader = nir_shader_create(NULL, options);
if (state) {
shader->num_user_structures = state->num_user_structures;
shader->user_structures = ralloc_array(shader, glsl_type *,
shader->num_user_structures);
memcpy(shader->user_structures, state->user_structures,
shader->num_user_structures * sizeof(glsl_type *));
} else {
shader->num_user_structures = 0;
shader->user_structures = NULL;
}
nir_visitor v1(shader, native_integers);
nir_function_visitor v2(&v1);
v2.run(ir);

View File

@ -42,9 +42,6 @@ nir_shader_create(void *mem_ctx, const nir_shader_compiler_options *options)
shader->options = options;
shader->num_user_structures = 0;
shader->user_structures = NULL;
exec_list_make_empty(&shader->functions);
exec_list_make_empty(&shader->registers);
exec_list_make_empty(&shader->globals);

View File

@ -1400,10 +1400,6 @@ typedef struct nir_shader {
/** list of global register in the shader */
struct exec_list registers;
/** structures used in this shader */
unsigned num_user_structures;
struct glsl_type **user_structures;
/** next available global register index */
unsigned reg_alloc;

View File

@ -844,10 +844,6 @@ nir_print_shader(nir_shader *shader, FILE *fp)
print_var_state state;
init_print_state(&state);
for (unsigned i = 0; i < shader->num_user_structures; i++) {
glsl_print_struct(shader->user_structures[i], fp);
}
struct hash_entry *entry;
hash_table_foreach(shader->uniforms, entry) {