From 2be3dbd90bff02fc6d1dd9f0d332c619d5f6ac86 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Wed, 19 Oct 2016 10:27:31 +1100 Subject: [PATCH] st/mesa: switch tes over to shared shader_info MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Reviewed-by: Jason Ekstrand --- src/mesa/state_tracker/st_program.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index cb402115c23..210aa33daf5 100644 --- 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); -- 2.30.2