From 7a4bbfa90d221c43509a1eb46243235869bfa5e8 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Wed, 19 Oct 2016 11:13:26 +1100 Subject: [PATCH] st/mesa: switch tcs 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/program/prog_statevars.c | 2 +- src/mesa/state_tracker/st_program.c | 2 +- 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); -- 2.30.2