OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/lower_io: Remove assign_var_locations_direct_first

Browse Source 
This is no longer used so we might as well get rid of it.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand
2015-08-18 14:45:35 -07:00
parent 259f7291de
commit c999a58f50
2 changed files with 0 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/glsl/nir/nir.h
View File

@@ -1474,9 +1474,6 @@ typedef struct nir_shader {
* access plus one * access plus one
*/ */
unsigned num_inputs, num_uniforms, num_outputs; unsigned num_inputs, num_uniforms, num_outputs;
/** the number of uniforms that are only accessed directly */
unsigned num_direct_uniforms;
} nir_shader; } nir_shader;
#define nir_foreach_overload(shader, overload) \ #define nir_foreach_overload(shader, overload) \
@@ -1633,11 +1630,6 @@ void nir_lower_locals_to_regs(nir_shader *shader);
void nir_assign_var_locations(struct exec_list *var_list, void nir_assign_var_locations(struct exec_list *var_list,
unsigned *size, unsigned *size,
int (*type_size)(const struct glsl_type *)); int (*type_size)(const struct glsl_type *));
void nir_assign_var_locations_direct_first(nir_shader *shader,
struct exec_list *var_list,
unsigned *direct_size,
unsigned *size,
int (*type_size)(const struct glsl_type *));
void nir_lower_io(nir_shader *shader, void nir_lower_io(nir_shader *shader,
int (*type_size)(const struct glsl_type *)); int (*type_size)(const struct glsl_type *));

74
src/glsl/nir/nir_lower_io.c
View File

@@ -76,80 +76,6 @@ deref_has_indirect(nir_deref_var *deref)
return false; return false;
} }
static bool
mark_indirect_uses_block(nir_block *block, void *void_state)
{
struct set *indirect_set = void_state;
nir_foreach_instr(block, instr) {
if (instr->type != nir_instr_type_intrinsic)
continue;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
for (unsigned i = 0;
i < nir_intrinsic_infos[intrin->intrinsic].num_variables; i++) {
if (deref_has_indirect(intrin->variables[i]))
_mesa_set_add(indirect_set, intrin->variables[i]->var);
}
}
return true;
}
/* Identical to nir_assign_var_locations_packed except that it assigns
* locations to the variables that are used 100% directly first and then
* assigns locations to variables that are used indirectly.
*/
void
nir_assign_var_locations_direct_first(nir_shader *shader,
struct exec_list *var_list,
unsigned *direct_size,
unsigned *size,
int (*type_size)(const struct glsl_type *))
{
struct set *indirect_set = _mesa_set_create(NULL, _mesa_hash_pointer,
_mesa_key_pointer_equal);
nir_foreach_overload(shader, overload) {
if (overload->impl)
nir_foreach_block(overload->impl, mark_indirect_uses_block,
indirect_set);
}
unsigned location = 0;
foreach_list_typed(nir_variable, var, node, var_list) {
if ((var->data.mode == nir_var_uniform || var->data.mode == nir_var_shader_storage) &&
var->interface_type != NULL)
continue;
if (_mesa_set_search(indirect_set, var))
continue;
var->data.driver_location = location;
location += type_size(var->type);
}
*direct_size = location;
foreach_list_typed(nir_variable, var, node, var_list) {
if ((var->data.mode == nir_var_uniform || var->data.mode == nir_var_shader_storage) &&
var->interface_type != NULL)
continue;
if (!_mesa_set_search(indirect_set, var))
continue;
var->data.driver_location = location;
location += type_size(var->type);
}
*size = location;
_mesa_set_destroy(indirect_set, NULL);
}
static unsigned static unsigned
get_io_offset(nir_deref_var *deref, nir_instr *instr, nir_src *indirect, get_io_offset(nir_deref_var *deref, nir_instr *instr, nir_src *indirect,
struct lower_io_state *state) struct lower_io_state *state)