[Mesa-stable] [Mesa-dev] [PATCH v2] ac/nir: set lod to 0 for ac_image_load_mip

[Nicolai Hähnle]

Is there any reason why we can't just use ac_image_load in such cases?

On 26.04.2018 13:18, Samuel Pitoiset wrote:
> Otherwise we hit an assertion in ac_build_image_opcode()
> for ac_image_load_mip.
> 
> v2: - set only for ac_image_load_mip
> 
> Fixes: 24fb3e6aa16 ("ac/nir: use ac_build_image_opcode for image intrinsics")
> Cc: 18.1 <mesa-stable at lists.freedesktop.org>
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
>   src/amd/common/ac_nir_to_llvm.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
> index e4ae6ef49ad..fb8e44509e9 100644
> --- a/src/amd/common/ac_nir_to_llvm.c
> +++ b/src/amd/common/ac_nir_to_llvm.c
> @@ -1276,6 +1276,8 @@ static LLVMValueRef build_tex_intrinsic(struct ac_nir_context *ctx,
>   		args->opcode = args->level_zero ||
>   			       instr->sampler_dim == GLSL_SAMPLER_DIM_MS ?
>   					ac_image_load : ac_image_load_mip;
> +		if (args->opcode == ac_image_load_mip && !args->lod)
> +			args->lod = ctx->ac.i32_0;
>   		args->level_zero = false;
>   		break;
>   	case nir_texop_txs:
> 


-- 
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.