spirv: Change spirv_to_nir() to return a nir_shader

[mesa.git] / src / amd / vulkan / radv_shader.c

diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index 05ca14b527a1fe506d2d883ab5a3bf0e8328610b..36dfc47de27b2f2ac11526ca220f56dd6f60eba1 100644 (file)
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -287,11 +287,10 @@ radv_shader_compile_to_nir(struct radv_device *device,
                        .push_const_addr_format = nir_address_format_logical,
                        .shared_addr_format = nir_address_format_32bit_offset,
                };
-               nir_function *entry_point = spirv_to_nir(spirv, module->size / 4,
-                                                        spec_entries, num_spec_entries,
-                                                        stage, entrypoint_name,
-                                                        &spirv_options, &nir_options);
-               nir = entry_point->shader;
+               nir = spirv_to_nir(spirv, module->size / 4,
+                                  spec_entries, num_spec_entries,
+                                  stage, entrypoint_name,
+                                  &spirv_options, &nir_options);
                assert(nir->info.stage == stage);
                nir_validate_shader(nir, "after spirv_to_nir");