diff options
| author | Timothy Arceri <[email protected]> | 2016-10-19 10:27:31 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
| commit | 2be3dbd90bff02fc6d1dd9f0d332c619d5f6ac86 (patch) | |
| tree | f88a3b48551c2619664ca1d6fde124868e537ce7 /src/mesa | |
| parent | 4f1c415cc46184d9929f198240eb4e9d22aa91d8 (diff) | |
st/mesa: switch tes over to shared shader_info
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/state_tracker/st_program.c | 12 |
1 files 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); |