glsl2/builtins: Fix "mod" builtin to use scalar/vector operations.

diff --git a/src/glsl/builtins/110/mod b/src/glsl/builtins/110/mod
index 9e08bbc7ef47fbfe6fac84268a362f809a21a7be..aeaea240e2d3719963cc7fb837db4878937c02a1 100644 (file)
--- a/src/glsl/builtins/110/mod
+++ b/src/glsl/builtins/110/mod
@@ -27,38 +27,17 @@
      (parameters
        (declare (in) vec2  arg0)
        (declare (in) float arg1))
-     ((declare () vec2 result)
-      (assign (constant bool (1)) (swiz x (var_ref result))
-              (expression float % (swiz x (var_ref arg0)) (var_ref arg1)))
-      (assign (constant bool (1)) (swiz y (var_ref result))
-              (expression float % (swiz y (var_ref arg0)) (var_ref arg1)))
-      (return (var_ref result))))
+     ((return (expression vec2 % (var_ref arg0) (var_ref arg1)))))
 
    (signature vec3
      (parameters
        (declare (in) vec3  arg0)
        (declare (in) float arg1))
-     ((declare () vec3 result)
-      (assign (constant bool (1)) (swiz x (var_ref result))
-              (expression float % (swiz x (var_ref arg0)) (var_ref arg1)))
-      (assign (constant bool (1)) (swiz y (var_ref result))
-              (expression float % (swiz y (var_ref arg0)) (var_ref arg1)))
-      (assign (constant bool (1)) (swiz z (var_ref result))
-              (expression float % (swiz z (var_ref arg0)) (var_ref arg1)))
-      (return (var_ref result))))
+     ((return (expression vec3 % (var_ref arg0) (var_ref arg1)))))
 
    (signature vec4
      (parameters
        (declare (in) vec4  arg0)
        (declare (in) float arg1))
-     ((declare () vec4 result)
-      (assign (constant bool (1)) (swiz x (var_ref result))
-              (expression float % (swiz x (var_ref arg0)) (var_ref arg1)))
-      (assign (constant bool (1)) (swiz y (var_ref result))
-              (expression float % (swiz y (var_ref arg0)) (var_ref arg1)))
-      (assign (constant bool (1)) (swiz z (var_ref result))
-              (expression float % (swiz z (var_ref arg0)) (var_ref arg1)))
-      (assign (constant bool (1)) (swiz w (var_ref result))
-              (expression float % (swiz w (var_ref arg0)) (var_ref arg1)))
-      (return (var_ref result))))
+     ((return (expression vec4 % (var_ref arg0) (var_ref arg1)))))
 ))