[Mesa-dev] [PATCH] i965/fs: Recalculate cfg in emit_curb_setup

[Matt Turner]

On Fri, Sep 26, 2014 at 2:59 PM, Jason Ekstrand <jason at jlekstrand.net> wrote:
> Signed-off-by: Jason Ekstrand <jason.ekstrand at intel.com>
> ---
>  src/mesa/drivers/dri/i965/brw_fs.cpp | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
> index ffe8ba8..95af5ab 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
> @@ -1477,6 +1477,8 @@ fs_visitor::assign_curb_setup()
>
>     prog_data->curb_read_length = ALIGN(stage_prog_data->nr_params, 8) / 8;
>
> +   calculate_cfg();
> +
>     /* Map the offsets in the UNIFORM file to fixed HW regs. */
>     foreach_block_and_inst(block, fs_inst, inst, cfg) {
>        for (unsigned int i = 0; i < inst->sources; i++) {
> --
> 2.1.0

This shouldn't be necessary. We never invalidate the cfg after
calculating it the first time.

Something's wrong.