From 7f74226dd2c8a58424e41836bd6bcdd50f363f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Capucho?= Date: Sat, 4 Sep 2021 11:28:03 +0100 Subject: [PATCH] [glsl-out] Fix select order --- src/back/glsl/mod.rs | 6 ++++-- tests/out/glsl/operators.main.Compute.glsl | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/back/glsl/mod.rs b/src/back/glsl/mod.rs index 4f65e5307..53deae757 100644 --- a/src/back/glsl/mod.rs +++ b/src/back/glsl/mod.rs @@ -2160,11 +2160,13 @@ impl<'a, W: Write> Writer<'a, W> { // TODO: Boolean mix on desktop required GL_EXT_shader_integer_mix if vec_select { + // Glsl defines that for mix when the condition is a boolean the first element + // is picked if condition is false and the second if condition is true write!(self.out, "mix(")?; - self.write_expr(accept, ctx)?; - write!(self.out, ", ")?; self.write_expr(reject, ctx)?; write!(self.out, ", ")?; + self.write_expr(accept, ctx)?; + write!(self.out, ", ")?; self.write_expr(condition, ctx)?; } else { write!(self.out, "(")?; diff --git a/tests/out/glsl/operators.main.Compute.glsl b/tests/out/glsl/operators.main.Compute.glsl index 6a78c8c1e..90f22cd11 100644 --- a/tests/out/glsl/operators.main.Compute.glsl +++ b/tests/out/glsl/operators.main.Compute.glsl @@ -14,7 +14,7 @@ struct Foo { vec4 builtins() { int s1_ = (true ? 1 : 0); vec4 s2_ = (true ? vec4(1.0, 1.0, 1.0, 1.0) : vec4(0.0, 0.0, 0.0, 0.0)); - vec4 s3_ = mix(vec4(0.0, 0.0, 0.0, 0.0), vec4(1.0, 1.0, 1.0, 1.0), bvec4(false, false, false, false)); + vec4 s3_ = mix(vec4(1.0, 1.0, 1.0, 1.0), vec4(0.0, 0.0, 0.0, 0.0), bvec4(false, false, false, false)); vec4 m1_ = mix(vec4(0.0, 0.0, 0.0, 0.0), vec4(1.0, 1.0, 1.0, 1.0), vec4(0.5, 0.5, 0.5, 0.5)); vec4 m2_ = mix(vec4(0.0, 0.0, 0.0, 0.0), vec4(1.0, 1.0, 1.0, 1.0), 0.1); return (((vec4(ivec4(s1_)) + s2_) + m1_) + m2_);