KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: avoid valgrind warning due to opaque only being set sometimes 

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@alum.mit.edu>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
This commit is contained in:
Ilia Mirkin 2016-07-08 01:35:15 -04:00
parent 59bb821180
commit 27e59ed477
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/main/texcompress_etc.c
View File

@ -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];