glsl/mesa: stop duplicating tes layout values

[mesa.git] / src / compiler / glsl / linker.cpp

diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index d4d368a69ce8fed7ae710236b9cc8ed55150569c..bf70f29039f22bf75ed8f6e00a4c40608e4d0790 100644 (file)
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -1886,19 +1886,15 @@ link_tes_in_layout_qualifiers(struct gl_shader_program *prog,
                   "primitive modes.\n");
       return;
    }
-   prog->TessEval.PrimitiveMode = linked_shader->TessEval.PrimitiveMode;
 
    if (linked_shader->TessEval.Spacing == 0)
       linked_shader->TessEval.Spacing = GL_EQUAL;
-   prog->TessEval.Spacing = linked_shader->TessEval.Spacing;
 
    if (linked_shader->TessEval.VertexOrder == 0)
       linked_shader->TessEval.VertexOrder = GL_CCW;
-   prog->TessEval.VertexOrder = linked_shader->TessEval.VertexOrder;
 
    if (linked_shader->TessEval.PointMode == -1)
       linked_shader->TessEval.PointMode = GL_FALSE;
-   prog->TessEval.PointMode = linked_shader->TessEval.PointMode;
 }
 
 
@@ -2235,7 +2231,7 @@ link_intrastage_shaders(void *mem_ctx,
       return NULL;
    }
 
-   gl_shader *linked = ctx->Driver.NewShader(NULL, 0, main->Type);
+   gl_shader *linked = ctx->Driver.NewShader(NULL, 0, shader_list[0]->Stage);
    linked->ir = new(linked) exec_list;
    clone_ir_list(mem_ctx, linked->ir, main->ir);