From 1f1007a4edcefa1c291c1b4e13d6cec35a59ca6f Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 8 May 2019 07:32:43 -0700 Subject: [PATCH] nir: Initialize lower_flrp_progress everywhere I don't know why I thought NIR_PASS always set the progress variable. Derp. Fixes: d41cdef2a59 ("nir: Use the flrp lowering pass instead of nir_opt_algebraic") Reviewed-by: Brian Paul Reviewed-by: Timothy Arceri Reviewed-by: Emil Velikov Coverity CID: 1444996 Coverity CID: 1444995 Coverity CID: 1444994 Coverity CID: 1444993 Coverity CID: 1444991 Coverity CID: 1444989 --- src/amd/vulkan/radv_shader.c | 2 +- src/broadcom/compiler/nir_to_vir.c | 2 +- src/gallium/drivers/panfrost/midgard/midgard_compile.c | 2 +- src/gallium/drivers/radeonsi/si_shader_nir.c | 2 +- src/gallium/drivers/vc4/vc4_program.c | 2 +- src/mesa/state_tracker/st_glsl_to_nir.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index a97ba3612e1..f60daf6d03d 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -170,7 +170,7 @@ radv_optimize_nir(struct nir_shader *shader, bool optimize_conservatively, NIR_PASS(progress, shader, nir_opt_algebraic); if (lower_flrp != 0) { - bool lower_flrp_progress; + bool lower_flrp_progress = false; NIR_PASS(lower_flrp_progress, shader, nir_lower_flrp, diff --git a/src/broadcom/compiler/nir_to_vir.c b/src/broadcom/compiler/nir_to_vir.c index 3e82f61d6ea..67747b14bb0 100644 --- a/src/broadcom/compiler/nir_to_vir.c +++ b/src/broadcom/compiler/nir_to_vir.c @@ -1322,7 +1322,7 @@ v3d_optimize_nir(struct nir_shader *s) NIR_PASS(progress, s, nir_opt_constant_folding); if (lower_flrp != 0) { - bool lower_flrp_progress; + bool lower_flrp_progress = false; NIR_PASS(lower_flrp_progress, s, nir_lower_flrp, lower_flrp, diff --git a/src/gallium/drivers/panfrost/midgard/midgard_compile.c b/src/gallium/drivers/panfrost/midgard/midgard_compile.c index 9c7928decf6..eaf473840ca 100644 --- a/src/gallium/drivers/panfrost/midgard/midgard_compile.c +++ b/src/gallium/drivers/panfrost/midgard/midgard_compile.c @@ -915,7 +915,7 @@ optimise_nir(nir_shader *nir) NIR_PASS(progress, nir, nir_opt_constant_folding); if (lower_flrp != 0) { - bool lower_flrp_progress; + bool lower_flrp_progress = false; NIR_PASS(lower_flrp_progress, nir, nir_lower_flrp, diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c index febd0e49a2c..8468ae90dde 100644 --- a/src/gallium/drivers/radeonsi/si_shader_nir.c +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c @@ -850,7 +850,7 @@ si_nir_opts(struct nir_shader *nir) NIR_PASS(progress, nir, nir_opt_constant_folding); if (lower_flrp != 0) { - bool lower_flrp_progress; + bool lower_flrp_progress = false; NIR_PASS(lower_flrp_progress, nir, nir_lower_flrp, lower_flrp, diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c index a2af55d6421..456af3a33d2 100644 --- a/src/gallium/drivers/vc4/vc4_program.c +++ b/src/gallium/drivers/vc4/vc4_program.c @@ -1547,7 +1547,7 @@ vc4_optimize_nir(struct nir_shader *s) NIR_PASS(progress, s, nir_opt_algebraic); NIR_PASS(progress, s, nir_opt_constant_folding); if (lower_flrp != 0) { - bool lower_flrp_progress; + bool lower_flrp_progress = false; NIR_PASS(lower_flrp_progress, s, nir_lower_flrp, lower_flrp, diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index 0a67d4532eb..57064251313 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -338,7 +338,7 @@ st_nir_opts(nir_shader *nir, bool scalar) NIR_PASS(progress, nir, nir_opt_constant_folding); if (lower_flrp != 0) { - bool lower_flrp_progress; + bool lower_flrp_progress = false; NIR_PASS(lower_flrp_progress, nir, nir_lower_flrp, lower_flrp, -- 2.30.2