diff options
| author | Iago Toral Quiroga <[email protected]> | 2018-01-16 09:37:11 +0100 |
|---|---|---|
| committer | Iago Toral Quiroga <[email protected]> | 2018-01-30 08:10:29 +0100 |
| commit | 99b57daf4a8289430728bec69f7dadfab457d990 (patch) | |
| tree | fb5dc92065e8bdeabe74b70f02cc8329b081394c /src | |
| parent | 6316c2ecbda6d9370f1f876981ebcc35393c04e8 (diff) | |
anv/pipeline: lower constant initializers on output variables earlier
If a shader only writes to an output via a constant initializer we
need to lower it before we call nir_remove_dead_variables so that
this pass sees the stores from the initializer and doesn't kill the
output.
Fixes test failures in new work-in-progress CTS tests:
dEQP-VK.spirv_assembly.instruction.graphics.variable_init.output_vert
dEQP-VK.spirv_assembly.instruction.graphics.variable_init.output_frag
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/intel/vulkan/anv_pipeline.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 48eefe828a7..e16a7a19940 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -179,6 +179,11 @@ anv_shader_compile_to_nir(struct anv_pipeline *pipeline, assert(exec_list_length(&nir->functions) == 1); entry_point->name = ralloc_strdup(entry_point, "main"); + /* Make sure we lower constant initializers on output variables so that + * nir_remove_dead_variables below sees the corresponding stores + */ + NIR_PASS_V(nir, nir_lower_constant_initializers, nir_var_shader_out); + NIR_PASS_V(nir, nir_remove_dead_variables, nir_var_shader_in | nir_var_shader_out | nir_var_system_value); |