st/mesa: switch tes over to shared shader_info

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>

diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index cb402115c23f915420d3096b0bc8bac8f455b196..210aa33daf5be4e59ec9fcd361da4dc0ae41b5a2 100644 (file)
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -1629,12 +1629,13 @@ st_translate_tesseval_program(struct st_context *st,
    if (ureg == NULL)
       return false;
 
-   if (sttep->Base.PrimitiveMode == GL_ISOLINES)
+   if (sttep->Base.Base.info.tes.primitive_mode == GL_ISOLINES)
       ureg_property(ureg, TGSI_PROPERTY_TES_PRIM_MODE, GL_LINES);
    else
-      ureg_property(ureg, TGSI_PROPERTY_TES_PRIM_MODE, sttep->Base.PrimitiveMode);
+      ureg_property(ureg, TGSI_PROPERTY_TES_PRIM_MODE,
+                    sttep->Base.Base.info.tes.primitive_mode);
 
-   switch (sttep->Base.Spacing) {
+   switch (sttep->Base.Base.info.tes.spacing) {
    case GL_EQUAL:
       ureg_property(ureg, TGSI_PROPERTY_TES_SPACING, PIPE_TESS_SPACING_EQUAL);
       break;
@@ -1651,8 +1652,9 @@ st_translate_tesseval_program(struct st_context *st,
    }
 
    ureg_property(ureg, TGSI_PROPERTY_TES_VERTEX_ORDER_CW,
-                 sttep->Base.VertexOrder == GL_CW);
-   ureg_property(ureg, TGSI_PROPERTY_TES_POINT_MODE, sttep->Base.PointMode);
+                 sttep->Base.Base.info.tes.vertex_order == GL_CW);
+   ureg_property(ureg, TGSI_PROPERTY_TES_POINT_MODE,
+                 sttep->Base.Base.info.tes.point_mode);
 
    st_translate_program_common(st, &sttep->Base.Base, sttep->glsl_to_tgsi,
                                ureg, PIPE_SHADER_TESS_EVAL, &sttep->tgsi);