nir: Change nir_shader_get_entrypoint to return an impl.

Jason suggested adding an assert(function->impl) here.  All callers
of this function actually want ->impl, so I decided just to change
the API.

We also change the nir_lower_io_to_temporaries API here.  All but one
caller passed nir_shader_get_entrypoint(), and with the previous commit,
it now uses a nir_function_impl internally.  Folding this change in
avoids the need to change it and change it back.

v2: Fix one call I missed in ir3_compiler (caught by Eric).

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
This commit is contained in:
Kenneth Graunke
2016-08-24 19:09:57 -07:00
parent 8479b03c58
commit 93bfa1d7a2
7 changed files with 14 additions and 18 deletions

View File

@@ -168,7 +168,8 @@ anv_shader_compile_to_nir(struct anv_device *device,
nir_propagate_invariant(nir);
nir_validate_shader(nir);
nir_lower_io_to_temporaries(entry_point->shader, entry_point, true, false);
nir_lower_io_to_temporaries(entry_point->shader, entry_point->impl,
true, false);
nir_lower_system_values(nir);
nir_validate_shader(nir);
@@ -616,7 +617,7 @@ anv_pipeline_compile_fs(struct anv_pipeline *pipeline,
unsigned num_rts = 0;
struct anv_pipeline_binding rt_bindings[8];
nir_function_impl *impl = nir_shader_get_entrypoint(nir)->impl;
nir_function_impl *impl = nir_shader_get_entrypoint(nir);
nir_foreach_variable_safe(var, &nir->outputs) {
if (var->data.location < FRAG_RESULT_DATA0)
continue;