radeonsi: do not set the shader->key for gs copy shaders
authorNicolai Hähnle <nicolai.haehnle@amd.com>
Fri, 22 Jan 2016 22:37:10 +0000 (17:37 -0500)
committerNicolai Hähnle <nicolai.haehnle@amd.com>
Mon, 25 Jan 2016 15:16:05 +0000 (10:16 -0500)
The key for a geometry shader would be interpreted as the key for a vertex
shader further down the line, which really doesn't make sense.

This does not affect the contents of shader->key because geometry shaders
don't have any key entries anyway.

Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
src/gallium/drivers/radeonsi/si_shader.c

index 38ed70c1e60a14e1fc801ee15f1b7abf8e771abc..c365b149a8699d91d603ff78496593a4677425d9 100644 (file)
@@ -4404,7 +4404,6 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
        if (si_shader_ctx.type == TGSI_PROCESSOR_GEOMETRY) {
                shader->gs_copy_shader = CALLOC_STRUCT(si_shader);
                shader->gs_copy_shader->selector = shader->selector;
-               shader->gs_copy_shader->key = shader->key;
                si_shader_ctx.shader = shader->gs_copy_shader;
                if ((r = si_generate_gs_copy_shader(sscreen, &si_shader_ctx,
                                                    shader, dump, debug))) {