[Mesa-dev] [PATCH] anv/nir_apply_pipeline_layout: Pass the nir_src from the nir_tex_src

Eduardo Lima Mitev elima at igalia.com
Sat May 21 07:33:59 UTC 2016


On 05/21/2016 09:30 AM, Eduardo Lima Mitev wrote:
> nir_instr_rewrite_src() expects a nir_src and it is currently being fed a
> nir_tex_src. This will crash something.
> ---

Well, it may never crash because nir_src is the first member of
nir_tex_src. But that seems flaky.

At the very least, this will silence the associated warning.

>  src/intel/vulkan/anv_nir_apply_pipeline_layout.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c
> index ddb099e..6481269 100644
> --- a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c
> +++ b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c
> @@ -163,7 +163,7 @@ lower_tex_deref(nir_tex_instr *tex, nir_deref_var *deref,
>            * first-class texture source.
>            */
>           tex->src[tex->num_srcs].src_type = src_type;
> -         nir_instr_rewrite_src(&tex->instr, &tex->src[tex->num_srcs],
> +         nir_instr_rewrite_src(&tex->instr, &tex->src[tex->num_srcs].src,
>                                 nir_src_for_ssa(index));
>           tex->num_srcs++;
>        } else {
> 



More information about the mesa-dev mailing list