summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2016-10-19 11:13:26 +1100
committerTimothy Arceri <[email protected]>2016-10-26 14:29:36 +1100
commit7a4bbfa90d221c43509a1eb46243235869bfa5e8 (patch)
treee84e4c8f2e69dcfe26edb6de085349d4cb9adfdb /src/mesa
parente6cecb837d26fce5392be87ad074f9bcbf27b47e (diff)
st/mesa: switch tcs 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/program/prog_statevars.c2
-rw-r--r--src/mesa/state_tracker/st_program.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c
index 6e6007ec6f9..86bbd0ac663 100644
--- 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 7cc36b4c985..65f903703c2 100644
--- 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);