glsl_to_tgsi: use _mesa_copy_linked_program_data
authorMarek Olšák <marek.olsak@amd.com>
Mon, 6 Oct 2014 19:12:14 +0000 (21:12 +0200)
committerMarek Olšák <marek.olsak@amd.com>
Tue, 21 Oct 2014 20:01:16 +0000 (22:01 +0200)
This deduplicates some code.

src/mesa/state_tracker/st_glsl_to_tgsi.cpp

index 21f4cb8cbe22d0acf46207df7493d7844766b4cd..a6ce033ed0349b9e296ee99028a07acbca29ae2c 100644 (file)
@@ -5214,6 +5214,7 @@ get_mesa_program(struct gl_context *ctx,
    v->have_sqrt = pscreen->get_shader_param(pscreen, ptarget,
                                             PIPE_SHADER_CAP_TGSI_SQRT_SUPPORTED);
 
+   _mesa_copy_linked_program_data(shader->Stage, shader_program, prog);
    _mesa_generate_parameters_list_for_uniforms(shader_program, shader,
                                               prog->Parameters);
 
@@ -5319,10 +5320,6 @@ get_mesa_program(struct gl_context *ctx,
    case GL_GEOMETRY_SHADER:
       stgp = (struct st_geometry_program *)prog;
       stgp->glsl_to_tgsi = v;
-      stgp->Base.InputType = shader_program->Geom.InputType;
-      stgp->Base.OutputType = shader_program->Geom.OutputType;
-      stgp->Base.VerticesOut = shader_program->Geom.VerticesOut;
-      stgp->Base.Invocations = shader_program->Geom.Invocations;
       break;
    default:
       assert(!"should not be reached");