[Mesa-dev] [PATCH 07/42] st/mesa: switch tcs over to shared shader_info

Marek Olšák maraeo at gmail.com
Thu Oct 20 14:41:30 UTC 2016


Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Thu, Oct 20, 2016 at 1:09 AM, Timothy Arceri
<timothy.arceri at collabora.com> wrote:
> ---
>  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 6e6007e..86bbd0a 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 7cc36b4..65f9037 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.7.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list