Bug 1659066 - Update glslopt-rs to 0.1.6. r=jnicol

Differential Revision: https://phabricator.services.mozilla.com/D87842

Cargo.lock

@@ -2081,9 +2081,9 @@ dependencies = [
 
 [[package]]
 name = "glslopt"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade35abcc6d6d49b294b2f39ea0c55ef616b682f4385553c77739f82bf163277"
+checksum = "5812f82ae612083dad826239289f681198449c6ae808c87caa3bfd47971b587f"
 dependencies = [
  "cc",
 ]

gfx/wr/webrender/Cargo.toml

@@ -22,7 +22,7 @@ leak_checks = []
 
 [build-dependencies]
 build-parallel = "0.1.1"
-glslopt = "0.1.5"
+glslopt = "0.1.6"
 webrender_build = { version = "0.0.1", path = "../webrender_build" }
 
 [dependencies]

third_party/rust/glslopt/Cargo.toml

@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "glslopt"
-version = "0.1.5"
+version = "0.1.6"
 authors = ["Jamie Nicol <jnicol@mozilla.com>"]
 description = "Optimizes GLSL shader code"
 keywords = ["opengl", "gl", "gles", "glsl", "shader"]

third_party/rust/glslopt/build.rs

@@ -1,7 +1,5 @@
 use cc;
 
-use std::env;
-
 /// Adds the required definitions to build mesa/glsl-optimizer for the
 /// target platform.
 fn configure(build: &mut cc::Build) -> &mut cc::Build {
@@ -20,19 +18,15 @@ fn configure(build: &mut cc::Build) -> &mut cc::Build {
         build.define("HAVE_TIMESPEC_GET", None);
     }
 
+    // Avoid using e.g. moz_malloc in Gecko builds.
+    build.define("MOZ_INCLUDE_MOZALLOC_H", None);
+    // Avoid using e.g. mozalloc_abort in Gecko builds.
+    build.define("mozilla_throw_gcc_h", None);
+
     build
 }
 
 fn main() {
-    // Unset CFLAGS which are probably intended for a target build,
-    // but might break building this as a build dependency if we are
-    // not cross-compiling.
-    let target = env::var("TARGET").unwrap();
-    env::remove_var(format!("CFLAGS_{}", &target));
-    env::remove_var(format!("CXXFLAGS_{}", &target));
-    env::remove_var(format!("CFLAGS_{}", target.replace("-", "_")));
-    env::remove_var(format!("CXXFLAGS_{}", target.replace("-", "_")));
-
     configure(&mut cc::Build::new())
         .warnings(false)
         .include("glsl-optimizer/include")

third_party/rust/glslopt/glsl-optimizer/src/compiler/glsl/ir_print_glsl_visitor.cpp

@@ -1462,7 +1462,7 @@ void print_float (string_buffer& buffer, float f)
 		strcpy(tmp, "(-1.0/0.0)");
 	
 	// Do similar thing for NaN
-	if (f != f)
+	if (isnan(f))
 		strcpy(tmp, "(0.0/0.0)");
 
 	#if _MSC_VER