i965/miptree: avoid uninitialized variable warnings
GCC 8.1.1 is having a hard time identifying that the values are properly initialized when used. In the 'memset_value' case, we pass the uninitialized value to another function (that will use only if the conditions match the initialization). Just give enough hint to the compiler to figure things out. Fixes the warnings ../../src/mesa/drivers/dri/i965/intel_mipmap_tree.c: In function ‘intel_miptree_alloc_aux’: ../../src/mesa/drivers/dri/i965/intel_mipmap_tree.c:1839:18: warning: ‘memset_value’ may be used uninitialized in this function [-Wmaybe-uninitialized] mt->aux_buf = intel_alloc_aux_buffer(brw, &aux_surf, needs_memset, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ memset_value); ~~~~~~~~~~~~~ ../../src/mesa/drivers/dri/i965/intel_mipmap_tree.c:1698:10: warning: ‘initial_state’ may be used uninitialized in this function [-Wmaybe-uninitialized] if (wants_memset) ^ ../../src/mesa/drivers/dri/i965/intel_mipmap_tree.c:1772:23: note: ‘initial_state’ was declared here enum isl_aux_state initial_state; ^~~~~~~~~~~~~ Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
This commit is contained in:
parent
8ec40824ae
commit
577c8d7288
|
@ -1772,7 +1772,7 @@ intel_miptree_alloc_aux(struct brw_context *brw,
|
|||
enum isl_aux_state initial_state;
|
||||
uint8_t memset_value;
|
||||
struct isl_surf aux_surf;
|
||||
MAYBE_UNUSED bool aux_surf_ok;
|
||||
MAYBE_UNUSED bool aux_surf_ok = false;
|
||||
|
||||
switch (mt->aux_usage) {
|
||||
case ISL_AUX_USAGE_NONE:
|
||||
|
@ -1781,6 +1781,7 @@ intel_miptree_alloc_aux(struct brw_context *brw,
|
|||
break;
|
||||
case ISL_AUX_USAGE_HIZ:
|
||||
initial_state = ISL_AUX_STATE_AUX_INVALID;
|
||||
memset_value = 0;
|
||||
aux_surf_ok = isl_surf_get_hiz_surf(&brw->isl_dev, &mt->surf, &aux_surf);
|
||||
break;
|
||||
case ISL_AUX_USAGE_MCS:
|
||||
|
|
Loading…
Reference in New Issue