[Mesa-dev] [PATCH] radeonsi: increase coords array for radeon_llvm_emit_prepare_cube_coords

[Michel Dänzer]

On 18.03.2015 01:53, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
> 
> radeon_llvm_emit_prepare_cube_coords uses coords[4] in some cases (TXB2 etc.)
> 
> Discovered by Coverity. Reported by Ilia Mirkin.
> 
> Cc: <mesa-stable at lists.freedesktop.org>
> ---
>  src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c | 2 +-
>  src/gallium/drivers/radeonsi/si_shader.c            | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c b/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
> index d89e2b4..1690194 100644
> --- a/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
> +++ b/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
> @@ -748,7 +748,7 @@ static void txp_fetch_args(
>  	const struct tgsi_full_instruction * inst = emit_data->inst;
>  	LLVMValueRef src_w;
>  	unsigned chan;
> -	LLVMValueRef coords[4];
> +	LLVMValueRef coords[5];
>  
>  	emit_data->dst_type = LLVMVectorType(bld_base->base.elem_type, 4);
>  	src_w = lp_build_emit_fetch(bld_base, emit_data->inst, 0, TGSI_CHAN_W);
> diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
> index de889ed..4dcf756 100644
> --- a/src/gallium/drivers/radeonsi/si_shader.c
> +++ b/src/gallium/drivers/radeonsi/si_shader.c
> @@ -1572,7 +1572,7 @@ static void tex_fetch_args(
>  	const struct tgsi_full_instruction * inst = emit_data->inst;
>  	unsigned opcode = inst->Instruction.Opcode;
>  	unsigned target = inst->Texture.Texture;
> -	LLVMValueRef coords[4];
> +	LLVMValueRef coords[5];
>  	LLVMValueRef address[16];
>  	int ref_pos;
>  	unsigned num_coords = tgsi_util_get_texture_coord_dim(target, &ref_pos);
> 

Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer