From be21ded2aef97b134379dd92b67e5e206720c1b1 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 5 Jan 2012 13:28:56 -0800 Subject: glsl/builtins: Add missing mix(genType, genType, bvec) built-ins. The IR for mix(float, float, bool) was missing a write mask, causing the IR reader to die horribly. Furthermore, I neglected to add any of the new prototypes to the 1.30 profiles. Fixes oglconform's glsl-bif-com advanced.mix test cases. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44477 Signed-off-by: Kenneth Graunke Reviewed-by: Ian Romanick --- src/glsl/builtins/ir/mix.ir | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/glsl/builtins/ir') diff --git a/src/glsl/builtins/ir/mix.ir b/src/glsl/builtins/ir/mix.ir index a31f0fa7086..70ae13c9f3f 100644 --- a/src/glsl/builtins/ir/mix.ir +++ b/src/glsl/builtins/ir/mix.ir @@ -53,7 +53,7 @@ (declare (in) float v1) (declare (in) float v2) (declare (in) bool a)) - ((assign (var_ref a) (var_ref v1) (var_ref v2)) + ((assign (var_ref a) (x) (var_ref v1) (var_ref v2)) (return (var_ref v1)))) (signature vec2 -- cgit v1.2.3