[Mesa-dev] [PATCH] i965/fs: Don't look at virtual_grf_sizes for uniforms

[Matt Turner]

On Fri, Sep 5, 2014 at 5:09 PM, Jason Ekstrand <jason at jlekstrand.net> wrote:
> Uniform values are in the UNIFORM register file, not the GRF register file.
> Looking in virtual_grf_sizes makes no sense and only makes the output of
> dump_instructions confusint.

typo

>
> Signed-off-by: Jason Ekstrand <jason.ekstrand at intel.com>
> ---
>  src/mesa/drivers/dri/i965/brw_fs.cpp | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
> index 4665dca..353f8c0 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
> @@ -2968,8 +2968,7 @@ fs_visitor::dump_instruction(backend_instruction *be_inst, FILE *file)
>           fprintf(file, "u%d", inst->src[i].reg + inst->src[i].reg_offset);
>           if (inst->src[i].reladdr) {
>              fprintf(file, "+reladdr");
> -         } else if (virtual_grf_sizes[inst->src[i].reg] != 1 ||
> -             inst->src[i].subreg_offset) {
> +         } else if (inst->src[i].subreg_offset) {

Can uniforms can have subreg offsets at all?

In any case, the old code is wrong.

Reviewed-by: Matt Turner <mattst88 at gmail.com>