Mesa (master): st/nir: run st_nir_opts after 64bit ops lowering

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 3cea9f981a14db797afb10225623acb96bd1c107
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3cea9f981a14db797afb10225623acb96bd1c107

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Tue Apr  2 08:56:07 2019 +0300

st/nir: run st_nir_opts after 64bit ops lowering

CID: 1444309
Fixes: 9ab1b1d0227 "st/nir: Move 64-bit lowering later"
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/mesa/state_tracker/st_glsl_to_nir.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index 8a58328ce48..9a4e030413b 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -436,7 +436,7 @@ st_glsl_to_nir(struct st_context *st, struct gl_program *prog,
          lowered_64bit_ops |= progress;
       } while (progress);
 
-      if (progress)
+      if (lowered_64bit_ops)
          st_nir_opts(nir, is_scalar);
    }