st/mesa: switch tcs 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/program/prog_statevars.c b/src/mesa/program/prog_statevars.c
index 6e6007ec6f900d8eccc4d89f7d30cc63f487f190..86bbd0ac663ac4cf5869ffb6d3b9ca0bc8e023be 100644 (file)
--- a/src/mesa/program/prog_statevars.c
+++ b/src/mesa/program/prog_statevars.c
@@ -604,7 +604,7 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[],
 
       case STATE_TES_PATCH_VERTICES_IN:
          if (ctx->TessCtrlProgram._Current)
-            val[0].i = ctx->TessCtrlProgram._Current->VerticesOut;
+            val[0].i = ctx->TessCtrlProgram._Current->Base.info.tcs.vertices_out;
          else
             val[0].i = ctx->TessCtrlProgram.patch_vertices;
          return;

diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 7cc36b4c9854e6959a8da61b1d50220ac4eee122..65f903703c2a342b78cf4335321271089ed49a09 100644 (file)
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -1605,7 +1605,7 @@ st_translate_tessctrl_program(struct st_context *st,
       return false;
 
    ureg_property(ureg, TGSI_PROPERTY_TCS_VERTICES_OUT,
-                 sttcp->Base.VerticesOut);
+                 sttcp->Base.Base.info.tcs.vertices_out);
 
    st_translate_program_common(st, &sttcp->Base.Base, sttcp->glsl_to_tgsi,
                                ureg, PIPE_SHADER_TESS_CTRL, &sttcp->tgsi);