On 2015-12-11 13:23:58, Kenneth Graunke wrote:
> The compact VUE map only works when varying packing is in use.
> Unfortunately, varying packing is disabled for TCS inputs.
>
> This is needed to fix Piglit's tcs-input-read-array-interface test.
>
> Signed-off-by: Kenneth Graunke <[email protected]>
> ---
> src/mesa/drivers/dri/i965/brw_nir.c | 2 +-
> src/mesa/drivers/dri/i965/brw_vs.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_nir.c
> b/src/mesa/drivers/dri/i965/brw_nir.c
> index e46e177..d405991 100644
> --- a/src/mesa/drivers/dri/i965/brw_nir.c
> +++ b/src/mesa/drivers/dri/i965/brw_nir.c
> @@ -263,7 +263,7 @@ brw_nir_lower_inputs(nir_shader *nir,
> GLbitfield64 inputs_read =
> nir->info.inputs_read & ~VARYING_BIT_PRIMITIVE_ID;
> brw_compute_vue_map(devinfo, &input_vue_map, inputs_read,
> - nir->info.separate_shader);
> + nir->info.separate_shader || nir->stage ==
> MESA_SHADER_TESS_CTRL);
line length
>
> foreach_list_typed(nir_variable, var, node, &nir->inputs) {
> var->data.driver_location = var->data.location;
> diff --git a/src/mesa/drivers/dri/i965/brw_vs.c
> b/src/mesa/drivers/dri/i965/brw_vs.c
> index 59b748f..c9748c9 100644
> --- a/src/mesa/drivers/dri/i965/brw_vs.c
> +++ b/src/mesa/drivers/dri/i965/brw_vs.c
> @@ -148,7 +148,7 @@ brw_codegen_vs_prog(struct brw_context *brw,
>
> brw_compute_vue_map(brw->intelScreen->devinfo,
> &prog_data.base.vue_map, outputs_written,
> - prog ? prog->SeparateShader : false);
> + prog ? prog->SeparateShader ||
> prog->_LinkedShaders[MESA_SHADER_TESS_CTRL] : false);
line length
Reviewed-by: Jordan Justen <[email protected]>
>
> if (0) {
> _mesa_fprint_program_opt(stderr, &vp->program.Base, PROG_PRINT_DEBUG,
> --
> 2.6.3
>
> _______________________________________________
> mesa-dev mailing list
> [email protected]
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
