diff options
| author | Timothy Arceri <timothy.arceri@collabora.com> | 2016-10-19 11:11:28 +1100 |
|---|---|---|
| committer | Timothy Arceri <timothy.arceri@collabora.com> | 2016-10-26 14:29:36 +1100 |
| commit | 750b14ed8e6ff539f17069dec63004159575ccd8 (patch) | |
| tree | 6b29bb64c91be9e7fef5fd4612eaa325d29e6473 | |
| parent | 7a4bbfa90d221c43509a1eb46243235869bfa5e8 (diff) | |
mesa: set tcs shader_info metadata directly
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
| -rw-r--r-- | src/compiler/shader_info.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/compiler/shader_info.c b/src/compiler/shader_info.c index ebd9caf1f2..2da9757854 100644 --- a/src/compiler/shader_info.c +++ b/src/compiler/shader_info.c @@ -40,10 +40,6 @@ copy_shader_info(const struct gl_shader_program *shader_prog, info->uses_texture_gather = sh->Program->UsesGather; switch (sh->Stage) { - case MESA_SHADER_TESS_CTRL: - info->tcs.vertices_out = sh->info.TessCtrl.VerticesOut; - break; - case MESA_SHADER_GEOMETRY: info->gs.vertices_in = shader_prog->Geom.VerticesIn; info->gs.output_primitive = sh->info.Geom.OutputType; diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index bbaf770640..7a6f1e0b44 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -2171,9 +2171,7 @@ _mesa_copy_linked_program_data(const struct gl_shader_program *src, dst->CullDistanceArraySize = src->Vert.CullDistanceArraySize; break; case MESA_SHADER_TESS_CTRL: { - struct gl_tess_ctrl_program *dst_tcp = - (struct gl_tess_ctrl_program *) dst; - dst_tcp->VerticesOut = dst_sh->info.TessCtrl.VerticesOut; + dst->info.tcs.vertices_out = dst_sh->info.TessCtrl.VerticesOut; break; } case MESA_SHADER_TESS_EVAL: { |