Module: Mesa
Branch: glsl2
Commit: 63a92c975dd97445979c6aa1c5fef63d37bfc897
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=63a92c975dd97445979c6aa1c5fef63d37bfc897

Author: Kenneth Graunke <kenn...@whitecape.org>
Date:   Wed Jul 21 17:17:44 2010 -0700

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

---

 src/glsl/builtins/110/mod |   27 +++------------------------
 1 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/src/glsl/builtins/110/mod b/src/glsl/builtins/110/mod
index 9e08bbc..aeaea24 100644
--- 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)))))
 ))

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to