Reviewed-by: Marek Olšák <marek.ol...@amd.com>
Marek
On Thu, Oct 20, 2016 at 10:46 AM, Timothy Arceri
<timothy.arc...@collabora.com> wrote:
> ---
> src/mesa/state_tracker/st_glsl_to_nir.cpp | 2 +-
> src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 +++-
> src/mesa/state_tracker/st_program.c | 3 ++-
> 3 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp
> b/src/mesa/state_tracker/st_glsl_to_nir.cpp
> index ef49194..d188bf4 100644
> --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
> +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
> @@ -83,7 +83,7 @@ st_nir_assign_vs_in_locations(struct gl_program *prog,
> nir_shader *nir)
> if ((prog->info.inputs_read & BITFIELD64_BIT(attr)) != 0) {
> input_to_index[attr] = num_inputs;
> num_inputs++;
> - if ((prog->DoubleInputsRead & BITFIELD64_BIT(attr)) != 0) {
> + if ((prog->info.double_inputs_read & BITFIELD64_BIT(attr)) != 0) {
> /* add placeholder for second part of a double attribute */
> num_inputs++;
> }
> diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> index 028457d..bd4765b 100644
> --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> @@ -6475,7 +6475,9 @@ get_mesa_program_tgsi(struct gl_context *ctx,
> do_set_program_inouts(shader->ir, prog, shader->Stage);
> _mesa_copy_linked_program_data(shader_program, shader);
> shrink_array_declarations(v->inputs, v->num_inputs,
> - &prog->info.inputs_read,
> prog->DoubleInputsRead, &prog->PatchInputsRead);
> + &prog->info.inputs_read,
> + prog->info.double_inputs_read,
> + &prog->PatchInputsRead);
> shrink_array_declarations(v->outputs, v->num_outputs,
> &prog->OutputsWritten, 0ULL,
> &prog->PatchOutputsWritten);
> count_resources(v, prog);
> diff --git a/src/mesa/state_tracker/st_program.c
> b/src/mesa/state_tracker/st_program.c
> index 5922e7a..28b7bf6 100644
> --- a/src/mesa/state_tracker/st_program.c
> +++ b/src/mesa/state_tracker/st_program.c
> @@ -254,7 +254,8 @@ st_translate_vertex_program(struct st_context *st,
> input_to_index[attr] = stvp->num_inputs;
> stvp->index_to_input[stvp->num_inputs] = attr;
> stvp->num_inputs++;
> - if ((stvp->Base.DoubleInputsRead & BITFIELD64_BIT(attr)) != 0) {
> + if ((stvp->Base.info.double_inputs_read &
> + BITFIELD64_BIT(attr)) != 0) {
> /* add placeholder for second part of a double attribute */
> stvp->index_to_input[stvp->num_inputs] =
> ST_DOUBLE_ATTRIB_PLACEHOLDER;
> stvp->num_inputs++;
> --
> 2.7.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
