diff options
| author | Timothy Arceri <[email protected]> | 2017-10-23 11:10:47 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-10-24 09:27:40 +1100 |
| commit | 013313cf895e4d47b2631d5f4dd32fcbce2b0a17 (patch) | |
| tree | 039a88ec86f6d836f63b338a3f432bfe924441df /src/amd/vulkan | |
| parent | 069211f205e0f62b3cdae94608b63b253f37799e (diff) | |
radv: clone meta shaders before linking
The IR is reused in different pipeline combinations so we need
to clone it to avoid link time optimistaions messing up the
original copy.
Fixes: 06f05040eb73 (radv: Link shaders)
Reviewed-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/amd/vulkan')
| -rw-r--r-- | src/amd/vulkan/radv_pipeline.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 669d9a4858e..30a90ac9608 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -1766,6 +1766,13 @@ void radv_create_shaders(struct radv_pipeline *pipeline, stage ? stage->pName : "main", i, stage ? stage->pSpecializationInfo : NULL); pipeline->active_stages |= mesa_to_vk_shader_stage(i); + /* We don't want to alter meta shaders IR directly so clone it + * first. + */ + if (nir[i]->info.name) { + nir[i] = nir_shader_clone(NULL, nir[i]); + } + } if (nir[MESA_SHADER_TESS_CTRL]) { @@ -1863,7 +1870,7 @@ void radv_create_shaders(struct radv_pipeline *pipeline, for (int i = 0; i < MESA_SHADER_STAGES; ++i) { free(codes[i]); - if (modules[i] && !modules[i]->nir && !pipeline->device->trace_bo) + if (modules[i] && !pipeline->device->trace_bo) ralloc_free(nir[i]); } |