glsl/builtins: Convert assignments to new format (with write mask).

1 files changed, 20 insertions, 29 deletions

diff --git a/src/glsl/builtins/ir/atan b/src/glsl/builtins/ir/atan
index 04e1898f9f3..6dc99d74d37 100644
--- a/src/glsl/builtins/ir/atan
+++ b/src/glsl/builtins/ir/atan
@@ -55,23 +55,23 @@
     (
       (declare () float r)
       (declare ( ) float abs_retval)
-      (assign (constant bool (1)) (var_ref abs_retval)  (call abs ((var_ref x) ))
-) 
+      (assign (constant bool (1)) (x) (var_ref abs_retval)  (call abs ((var_ref x) ))
+)
       (if (expression bool > (var_ref abs_retval) (constant float (0.000100)) ) (
         (declare ( ) float atan_retval)
-        (assign (constant bool (1)) (var_ref atan_retval)  (call atan ((expression float / (var_ref y) (var_ref x) ) ))
-) 
-        (assign (constant bool (1)) (var_ref r)  (var_ref atan_retval) ) 
+        (assign (constant bool (1)) (x) (var_ref atan_retval)  (call atan ((expression float / (var_ref y) (var_ref x) ) ))
+)
+        (assign (constant bool (1)) (x) (var_ref r)  (var_ref atan_retval) )
         (if (expression bool < (var_ref x) (constant float (0.000000)) ) (
           (if (expression bool >= (var_ref y) (constant float (0.000000)) ) (
             (declare ( ) float assignment_tmp)
-            (assign (constant bool (1)) (var_ref assignment_tmp)  (expression float + (var_ref r) (constant float (3.141593)) ) ) 
-            (assign (constant bool (1)) (var_ref r)  (var_ref assignment_tmp) ) 
+            (assign (constant bool (1)) (x) (var_ref assignment_tmp)  (expression float + (var_ref r) (constant float (3.141593)) ) )
+            (assign (constant bool (1)) (x) (var_ref r)  (var_ref assignment_tmp) )
           )
           (
             (declare ( ) float assignment_tmp)
-            (assign (constant bool (1)) (var_ref assignment_tmp)  (expression float - (var_ref r) (constant float (3.141593)) ) ) 
-            (assign (constant bool (1)) (var_ref r)  (var_ref assignment_tmp) ) 
+            (assign (constant bool (1)) (x) (var_ref assignment_tmp)  (expression float - (var_ref r) (constant float (3.141593)) ) )
+            (assign (constant bool (1)) (x) (var_ref r)  (var_ref assignment_tmp) )
           ))
 
         )
@@ -81,8 +81,8 @@
       )
       (
         (declare () float sgn)
-        (assign (constant bool (1)) (var_ref sgn) (expression float sign (var_ref y)))
-        (assign (constant bool (1)) (var_ref r) (expression float * (var_ref sgn) (constant float (1.5707965))))
+        (assign (constant bool (1)) (x) (var_ref sgn) (expression float sign (var_ref y)))
+        (assign (constant bool (1)) (x) (var_ref r) (expression float * (var_ref sgn) (constant float (1.5707965))))
       ))
 
       (return (var_ref r) )
@@ -95,12 +95,10 @@
        (declare (in) vec2 y)
        (declare (in) vec2 x))
      ((declare () vec2 r)
-      (assign (constant bool (1))
-	      (swiz x (var_ref r))
+      (assign (constant bool (1)) (x) (var_ref r)
 	      (call atan ((swiz x (var_ref y))
 			  (swiz x (var_ref x)))))
-      (assign (constant bool (1))
-	      (swiz y (var_ref r))
+      (assign (constant bool (1)) (y) (var_ref r)
 	      (call atan ((swiz y (var_ref y))
 			  (swiz y (var_ref x)))))
       (return (var_ref r))))
@@ -110,16 +108,13 @@
        (declare (in) vec3 y)
        (declare (in) vec3 x))
      ((declare () vec3 r)
-      (assign (constant bool (1))
-	      (swiz x (var_ref r))
+      (assign (constant bool (1)) (x) (var_ref r)
 	      (call atan ((swiz x (var_ref y))
 			  (swiz x (var_ref x)))))
-      (assign (constant bool (1))
-	      (swiz y (var_ref r))
+      (assign (constant bool (1)) (y) (var_ref r)
 	      (call atan ((swiz y (var_ref y))
 			  (swiz y (var_ref x)))))
-      (assign (constant bool (1))
-	      (swiz z (var_ref r))
+      (assign (constant bool (1)) (z) (var_ref r)
 	      (call atan ((swiz z (var_ref y))
 			  (swiz z (var_ref x)))))
       (return (var_ref r))))
@@ -129,20 +124,16 @@
        (declare (in) vec4 y)
        (declare (in) vec4 x))
      ((declare () vec4 r)
-      (assign (constant bool (1))
-	      (swiz x (var_ref r))
+      (assign (constant bool (1)) (x) (var_ref r)
 	      (call atan ((swiz x (var_ref y))
 			  (swiz x (var_ref x)))))
-      (assign (constant bool (1))
-	      (swiz y (var_ref r))
+      (assign (constant bool (1)) (y) (var_ref r)
 	      (call atan ((swiz y (var_ref y))
 			  (swiz y (var_ref x)))))
-      (assign (constant bool (1))
-	      (swiz z (var_ref r))
+      (assign (constant bool (1)) (z) (var_ref r)
 	      (call atan ((swiz z (var_ref y))
 			  (swiz z (var_ref x)))))
-      (assign (constant bool (1))
-	      (swiz w (var_ref r))
+      (assign (constant bool (1)) (w) (var_ref r)
 	      (call atan ((swiz w (var_ref y))
 			  (swiz w (var_ref x)))))
       (return (var_ref r)))))