From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Tue, 18 Oct 2016 23:29:56 +0000 (+1100)
Subject: mesa: copy tes metadata directly to shared shader info
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=65225c20c64dd5980f4e3a4eaecb9088aabea2fb;p=mesa.git

mesa: copy tes metadata directly to shared shader info

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

diff --git a/src/compiler/shader_info.c b/src/compiler/shader_info.c
index 3ec1e8ad6d5..2da97578548 100644
--- a/src/compiler/shader_info.c
+++ b/src/compiler/shader_info.c
@@ -40,17 +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_EVAL: {
-      struct gl_tess_eval_program *tep =
-         (struct gl_tess_eval_program *)sh->Program;
-
-      info->tes.primitive_mode = tep->PrimitiveMode;
-      info->tes.spacing = tep->Spacing;
-      info->tes.vertex_order = tep->VertexOrder;
-      info->tes.point_mode = tep->PointMode;
-      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 7a6f1e0b445..abfeeffbb7d 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -2175,13 +2175,10 @@ _mesa_copy_linked_program_data(const struct gl_shader_program *src,
       break;
    }
    case MESA_SHADER_TESS_EVAL: {
-      struct gl_tess_eval_program *dst_tep =
-         (struct gl_tess_eval_program *) dst;
-
-      dst_tep->PrimitiveMode = dst_sh->info.TessEval.PrimitiveMode;
-      dst_tep->Spacing = dst_sh->info.TessEval.Spacing;
-      dst_tep->VertexOrder = dst_sh->info.TessEval.VertexOrder;
-      dst_tep->PointMode = dst_sh->info.TessEval.PointMode;
+      dst->info.tes.primitive_mode = dst_sh->info.TessEval.PrimitiveMode;
+      dst->info.tes.spacing = dst_sh->info.TessEval.Spacing;
+      dst->info.tes.vertex_order = dst_sh->info.TessEval.VertexOrder;
+      dst->info.tes.point_mode = dst_sh->info.TessEval.PointMode;
       dst->ClipDistanceArraySize = src->TessEval.ClipDistanceArraySize;
       dst->CullDistanceArraySize = src->TessEval.CullDistanceArraySize;
       break;