summaryrefslogtreecommitdiffstats
path: root/src/glsl/builtins/110
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2010-07-10 12:54:41 -0700
committerKenneth Graunke <[email protected]>2010-07-14 16:49:24 -0700
commitd5316aeb38865b3315a8a2b46f2c5bfd0d985d65 (patch)
tree2dfb2154f1e0d474e4913a7a9762bdeb54f46b52 /src/glsl/builtins/110
parent8984203abb711d5b9e763afc6afc8f52cc4f7cc2 (diff)
glsl2/builtins: Rework clamp to use scalar/vector combinations.
Diffstat (limited to 'src/glsl/builtins/110')
-rw-r--r--src/glsl/builtins/110/clamp18
1 files changed, 3 insertions, 15 deletions
diff --git a/src/glsl/builtins/110/clamp b/src/glsl/builtins/110/clamp
index 94c8e5ed168..d05cc76dc23 100644
--- a/src/glsl/builtins/110/clamp
+++ b/src/glsl/builtins/110/clamp
@@ -32,31 +32,19 @@
(declare (in) vec2 arg0)
(declare (in) float arg1)
(declare (in) float arg2))
- ((declare () vec2 result)
- (assign (constant bool (1)) (swiz x (var_ref result)) (expression vec4 max (expression vec4 min (swiz x (var_ref arg0)) (var_ref arg2)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz y (var_ref result)) (expression vec4 max (expression vec4 min (swiz y (var_ref arg0)) (var_ref arg2)) (var_ref arg1)))
- (return (var_ref result))))
+ ((return (expression vec2 max (expression vec2 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
(signature vec3
(parameters
(declare (in) vec3 arg0)
(declare (in) float arg1)
(declare (in) float arg2))
- ((declare () vec3 result)
- (assign (constant bool (1)) (swiz x (var_ref result)) (expression vec4 max (expression vec4 min (swiz x (var_ref arg0)) (var_ref arg2)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz y (var_ref result)) (expression vec4 max (expression vec4 min (swiz y (var_ref arg0)) (var_ref arg2)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz z (var_ref result)) (expression vec4 max (expression vec4 min (swiz z (var_ref arg0)) (var_ref arg2)) (var_ref arg1)))
- (return (var_ref result))))
+ ((return (expression vec3 max (expression vec3 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
(signature vec4
(parameters
(declare (in) vec4 arg0)
(declare (in) float arg1)
(declare (in) float arg2))
- ((declare () vec4 result)
- (assign (constant bool (1)) (swiz x (var_ref result)) (expression vec4 max (expression vec4 min (swiz x (var_ref arg0)) (var_ref arg2)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz y (var_ref result)) (expression vec4 max (expression vec4 min (swiz y (var_ref arg0)) (var_ref arg2)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz z (var_ref result)) (expression vec4 max (expression vec4 min (swiz z (var_ref arg0)) (var_ref arg2)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz w (var_ref result)) (expression vec4 max (expression vec4 min (swiz w (var_ref arg0)) (var_ref arg2)) (var_ref arg1)))
- (return (var_ref result))))
+ ((return (expression vec4 max (expression vec4 min (var_ref arg0) (var_ref arg2)) (var_ref arg1)))))
))