OSDN Git Service

radv: clone meta shaders before linking
authorTimothy Arceri <tarceri@itsqueeze.com>
Mon, 23 Oct 2017 00:10:47 +0000 (11:10 +1100)
committerTimothy Arceri <tarceri@itsqueeze.com>
Mon, 23 Oct 2017 22:27:40 +0000 (09:27 +1100)
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 <airlied@redhat.com>
src/amd/vulkan/radv_pipeline.c

index 669d9a4..30a90ac 100644 (file)
@@ -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]);
        }