From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Wed, 19 Oct 2016 00:11:28 +0000 (+1100)
Subject: mesa: set tcs shader_info metadata directly
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=750b14ed8e6ff539f17069dec63004159575ccd8;p=mesa.git

mesa: set tcs shader_info metadata directly

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/compiler/shader_info.c b/src/compiler/shader_info.c
index ebd9caf1f24..2da97578548 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 bbaf7706407..7a6f1e0b445 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: {