i965: Use nir_foreach_variable

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand 2015-10-02 18:16:10 -07:00
parent 050e4787d3
commit 1e3c1b107e
4 changed files with 7 additions and 7 deletions

View file

@ -58,7 +58,7 @@ fs_visitor::nir_setup_inputs()
{
nir_inputs = bld.vgrf(BRW_REGISTER_TYPE_F, nir->num_inputs);
foreach_list_typed(nir_variable, var, node, &nir->inputs) {
nir_foreach_variable(var, &nir->inputs) {
enum brw_reg_type type = brw_type_for_base_type(var->type);
fs_reg input = offset(nir_inputs, bld, var->data.driver_location);
@ -122,7 +122,7 @@ fs_visitor::nir_setup_outputs()
nir_outputs = bld.vgrf(BRW_REGISTER_TYPE_F, nir->num_outputs);
foreach_list_typed(nir_variable, var, node, &nir->outputs) {
nir_foreach_variable(var, &nir->outputs) {
fs_reg reg = offset(nir_outputs, bld, var->data.driver_location);
int vector_elements =
@ -180,7 +180,7 @@ fs_visitor::nir_setup_uniforms()
uniforms = nir->num_uniforms;
foreach_list_typed(nir_variable, var, node, &nir->uniforms) {
nir_foreach_variable(var, &nir->uniforms) {
/* UBO's and atomics don't take up space in the uniform file */
if (var->interface_type != NULL || var->type->contains_atomic())
continue;

View file

@ -40,7 +40,7 @@ brw_nir_lower_outputs(nir_shader *nir, bool is_scalar)
if (is_scalar) {
nir_assign_var_locations(&nir->outputs, &nir->num_outputs, type_size_scalar);
} else {
foreach_list_typed(nir_variable, var, node, &nir->outputs)
nir_foreach_variable(var, &nir->outputs)
var->data.driver_location = var->data.location;
}
}

View file

@ -129,7 +129,7 @@ brw_nir_setup_glsl_uniforms(nir_shader *shader,
{
unsigned comps_per_unit = is_scalar ? 1 : 4;
foreach_list_typed(nir_variable, var, node, &shader->uniforms) {
nir_foreach_variable(var, &shader->uniforms) {
/* UBO's, atomics and samplers don't take up space in the
uniform file */
if (var->interface_type != NULL || var->type->contains_atomic())

View file

@ -119,7 +119,7 @@ vec4_visitor::nir_setup_inputs()
{
nir_inputs = ralloc_array(mem_ctx, src_reg, nir->num_inputs);
foreach_list_typed(nir_variable, var, node, &nir->inputs) {
nir_foreach_variable(var, &nir->inputs) {
int offset = var->data.driver_location;
unsigned size = type_size_vec4(var->type);
for (unsigned i = 0; i < size; i++) {
@ -134,7 +134,7 @@ vec4_visitor::nir_setup_uniforms()
{
uniforms = nir->num_uniforms;
foreach_list_typed(nir_variable, var, node, &nir->uniforms) {
nir_foreach_variable(var, &nir->uniforms) {
/* UBO's and atomics don't take up space in the uniform file */
if (var->interface_type != NULL || var->type->contains_atomic())
continue;