[Mesa-dev] [PATCH 1/4] mesa: avoid valgrind warning due to opaque only being set sometimes

[Ilia Mirkin]

ping

On Fri, Jul 8, 2016 at 2:48 AM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> Valgrind complains with a "Conditional jump or move depends on
> uninitialised value(s)" warning due to opaque being conditionally
> initialized. However in the punchthrough_alpha == true case, it is
> always initialized, so just flip the condition around to silence the
> warning.
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>  src/mesa/main/texcompress_etc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/main/texcompress_etc.c b/src/mesa/main/texcompress_etc.c
> index f29561c..d465010 100644
> --- a/src/mesa/main/texcompress_etc.c
> +++ b/src/mesa/main/texcompress_etc.c
> @@ -458,10 +458,10 @@ etc2_rgb8_parse_block(struct etc2_block *block,
>        /* Use same modifier tables as for etc1 textures if opaque bit is set
>         * or if non punchthrough texture format
>         */
> -      block->modifier_tables[0] = (block->opaque || !punchthrough_alpha) ?
> +      block->modifier_tables[0] = (!punchthrough_alpha || block->opaque) ?
>                                    etc1_modifier_tables[table1_idx] :
>                                    etc2_modifier_tables_non_opaque[table1_idx];
> -      block->modifier_tables[1] = (block->opaque || !punchthrough_alpha) ?
> +      block->modifier_tables[1] = (!punchthrough_alpha || block->opaque) ?
>                                    etc1_modifier_tables[table2_idx] :
>                                    etc2_modifier_tables_non_opaque[table2_idx];
>
> --
> 2.7.3
>