summaryrefslogtreecommitdiffstats
path: root/src/glsl/builtins/130
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2010-07-09 12:12:41 -0700
committerKenneth Graunke <[email protected]>2010-07-14 16:49:24 -0700
commit8984203abb711d5b9e763afc6afc8f52cc4f7cc2 (patch)
tree304bc439f151e4589e49df146e49cb20b7b33a82 /src/glsl/builtins/130
parentce5ae5f49d82b545ab204b9fdb9a8f939e0a6d78 (diff)
glsl2/builtins: Rework min/max to use scalar/vector combinations.
Diffstat (limited to 'src/glsl/builtins/130')
-rw-r--r--src/glsl/builtins/130/max54
-rw-r--r--src/glsl/builtins/130/min54
2 files changed, 12 insertions, 96 deletions
diff --git a/src/glsl/builtins/130/max b/src/glsl/builtins/130/max
index 45a6089c9f2..0863e411a32 100644
--- a/src/glsl/builtins/130/max
+++ b/src/glsl/builtins/130/max
@@ -27,40 +27,19 @@
(parameters
(declare (in) ivec2 arg0)
(declare (in) int arg1))
- ((declare () ivec2 result)
- (assign (constant bool (1)) (swiz x (var_ref result))
- (expression int max (swiz x (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz y (var_ref result))
- (expression int max (swiz y (var_ref arg0)) (var_ref arg1)))
- (return (var_ref result))))
+ ((return (expression ivec2 max (var_ref arg0) (var_ref arg1)))))
(signature ivec3
(parameters
(declare (in) ivec3 arg0)
(declare (in) int arg1))
- ((declare () ivec3 result)
- (assign (constant bool (1)) (swiz x (var_ref result))
- (expression int max (swiz x (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz y (var_ref result))
- (expression int max (swiz y (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz z (var_ref result))
- (expression int max (swiz z (var_ref arg0)) (var_ref arg1)))
- (return (var_ref result))))
+ ((return (expression ivec3 max (var_ref arg0) (var_ref arg1)))))
(signature ivec4
(parameters
(declare (in) ivec4 arg0)
(declare (in) int arg1))
- ((declare () ivec4 result)
- (assign (constant bool (1)) (swiz x (var_ref result))
- (expression int max (swiz x (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz y (var_ref result))
- (expression int max (swiz y (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz z (var_ref result))
- (expression int max (swiz z (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz w (var_ref result))
- (expression int max (swiz w (var_ref arg0)) (var_ref arg1)))
- (return (var_ref result))))
+ ((return (expression ivec4 max (var_ref arg0) (var_ref arg1)))))
(signature uint
(parameters
@@ -90,38 +69,17 @@
(parameters
(declare (in) uvec2 arg0)
(declare (in) uint arg1))
- ((declare () uvec2 result)
- (assign (constant bool (1)) (swiz x (var_ref result))
- (expression uint max (swiz x (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz y (var_ref result))
- (expression uint max (swiz y (var_ref arg0)) (var_ref arg1)))
- (return (var_ref result))))
+ ((return (expression uvec2 max (var_ref arg0) (var_ref arg1)))))
(signature uvec3
(parameters
(declare (in) uvec3 arg0)
(declare (in) uint arg1))
- ((declare () uvec3 result)
- (assign (constant bool (1)) (swiz x (var_ref result))
- (expression uint max (swiz x (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz y (var_ref result))
- (expression uint max (swiz y (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz z (var_ref result))
- (expression uint max (swiz z (var_ref arg0)) (var_ref arg1)))
- (return (var_ref result))))
+ ((return (expression uvec3 max (var_ref arg0) (var_ref arg1)))))
(signature uvec4
(parameters
(declare (in) uvec4 arg0)
(declare (in) uint arg1))
- ((declare () uvec4 result)
- (assign (constant bool (1)) (swiz x (var_ref result))
- (expression uint max (swiz x (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz y (var_ref result))
- (expression uint max (swiz y (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz z (var_ref result))
- (expression uint max (swiz z (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz w (var_ref result))
- (expression uint max (swiz w (var_ref arg0)) (var_ref arg1)))
- (return (var_ref result))))
+ ((return (expression uvec4 max (var_ref arg0) (var_ref arg1)))))
))
diff --git a/src/glsl/builtins/130/min b/src/glsl/builtins/130/min
index d98ec1e79da..576546f6f20 100644
--- a/src/glsl/builtins/130/min
+++ b/src/glsl/builtins/130/min
@@ -27,40 +27,19 @@
(parameters
(declare (in) ivec2 arg0)
(declare (in) int arg1))
- ((declare () ivec2 result)
- (assign (constant bool (1)) (swiz x (var_ref result))
- (expression int min (swiz x (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz y (var_ref result))
- (expression int min (swiz y (var_ref arg0)) (var_ref arg1)))
- (return (var_ref result))))
+ ((return (expression ivec2 min (var_ref arg0) (var_ref arg1)))))
(signature ivec3
(parameters
(declare (in) ivec3 arg0)
(declare (in) int arg1))
- ((declare () ivec3 result)
- (assign (constant bool (1)) (swiz x (var_ref result))
- (expression int min (swiz x (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz y (var_ref result))
- (expression int min (swiz y (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz z (var_ref result))
- (expression int min (swiz z (var_ref arg0)) (var_ref arg1)))
- (return (var_ref result))))
+ ((return (expression ivec3 min (var_ref arg0) (var_ref arg1)))))
(signature ivec4
(parameters
(declare (in) ivec4 arg0)
(declare (in) int arg1))
- ((declare () ivec4 result)
- (assign (constant bool (1)) (swiz x (var_ref result))
- (expression int min (swiz x (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz y (var_ref result))
- (expression int min (swiz y (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz z (var_ref result))
- (expression int min (swiz z (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz w (var_ref result))
- (expression int min (swiz w (var_ref arg0)) (var_ref arg1)))
- (return (var_ref result))))
+ ((return (expression ivec4 min (var_ref arg0) (var_ref arg1)))))
(signature uint
(parameters
@@ -90,38 +69,17 @@
(parameters
(declare (in) uvec2 arg0)
(declare (in) uint arg1))
- ((declare () uvec2 result)
- (assign (constant bool (1)) (swiz x (var_ref result))
- (expression uint min (swiz x (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz y (var_ref result))
- (expression uint min (swiz y (var_ref arg0)) (var_ref arg1)))
- (return (var_ref result))))
+ ((return (expression uvec2 min (var_ref arg0) (var_ref arg1)))))
(signature uvec3
(parameters
(declare (in) uvec3 arg0)
(declare (in) uint arg1))
- ((declare () uvec3 result)
- (assign (constant bool (1)) (swiz x (var_ref result))
- (expression uint min (swiz x (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz y (var_ref result))
- (expression uint min (swiz y (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz z (var_ref result))
- (expression uint min (swiz z (var_ref arg0)) (var_ref arg1)))
- (return (var_ref result))))
+ ((return (expression uvec3 min (var_ref arg0) (var_ref arg1)))))
(signature uvec4
(parameters
(declare (in) uvec4 arg0)
(declare (in) uint arg1))
- ((declare () uvec4 result)
- (assign (constant bool (1)) (swiz x (var_ref result))
- (expression uint min (swiz x (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz y (var_ref result))
- (expression uint min (swiz y (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz z (var_ref result))
- (expression uint min (swiz z (var_ref arg0)) (var_ref arg1)))
- (assign (constant bool (1)) (swiz w (var_ref result))
- (expression uint min (swiz w (var_ref arg0)) (var_ref arg1)))
- (return (var_ref result))))
+ ((return (expression uvec4 min (var_ref arg0) (var_ref arg1)))))
))