On 5 September 2011 12:24, Kenneth Graunke <<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>> wrote: <div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"> Each of these vecN constants only provided one component, which is illegal. The printed IR is meant to contain exactly as many components as are necessary; the IR reader does not splat single values. Signed-off-by: Kenneth Graunke <<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>> --- src/glsl/builtins/ir/acosh | 6 +++--- src/glsl/builtins/ir/asinh | 6 +++--- src/glsl/builtins/ir/atanh | 18 +++++++++--------- src/glsl/builtins/ir/cosh | 6 +++--- src/glsl/builtins/ir/sinh | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/glsl/builtins/ir/acosh b/src/glsl/builtins/ir/acosh index 5518e75..9a4c291 100644 --- a/src/glsl/builtins/ir/acosh +++ b/src/glsl/builtins/ir/acosh @@ -7,15 +7,15 @@ (signature vec2 (parameters (declare (in) vec2 x)) - ((return (expression vec2 log (expression vec2 + (var_ref x) (expression vec2 sqrt (expression vec2 - (expression vec2 * (var_ref x) (var_ref x)) (constant vec2 (1))))))))) + ((return (expression vec2 log (expression vec2 + (var_ref x) (expression vec2 sqrt (expression vec2 - (expression vec2 * (var_ref x) (var_ref x)) (constant float (1))))))))) (signature vec3 (parameters (declare (in) vec3 x)) - ((return (expression vec3 log (expression vec3 + (var_ref x) (expression vec3 sqrt (expression vec3 - (expression vec3 * (var_ref x) (var_ref x)) (constant vec3 (1))))))))) + ((return (expression vec3 log (expression vec3 + (var_ref x) (expression vec3 sqrt (expression vec3 - (expression vec3 * (var_ref x) (var_ref x)) (constant float (1))))))))) (signature vec4 (parameters (declare (in) vec4 x)) - ((return (expression vec4 log (expression vec4 + (var_ref x) (expression vec4 sqrt (expression vec4 - (expression vec4 * (var_ref x) (var_ref x)) (constant vec4 (1))))))))) + ((return (expression vec4 log (expression vec4 + (var_ref x) (expression vec4 sqrt (expression vec4 - (expression vec4 * (var_ref x) (var_ref x)) (constant float (1))))))))) )) diff --git a/src/glsl/builtins/ir/asinh b/src/glsl/builtins/ir/asinh index cdc2c20..93f73cc 100644 --- a/src/glsl/builtins/ir/asinh +++ b/src/glsl/builtins/ir/asinh @@ -7,15 +7,15 @@ (signature vec2 (parameters (declare (in) vec2 x)) - ((return (expression vec2 log (expression vec2 + (var_ref x) (expression vec2 sqrt (expression vec2 + (expression vec2 * (var_ref x) (var_ref x)) (constant vec2 (1))))))))) + ((return (expression vec2 log (expression vec2 + (var_ref x) (expression vec2 sqrt (expression vec2 + (expression vec2 * (var_ref x) (var_ref x)) (constant float (1))))))))) (signature vec3 (parameters (declare (in) vec3 x)) - ((return (expression vec3 log (expression vec3 + (var_ref x) (expression vec3 sqrt (expression vec3 + (expression vec3 * (var_ref x) (var_ref x)) (constant vec3 (1))))))))) + ((return (expression vec3 log (expression vec3 + (var_ref x) (expression vec3 sqrt (expression vec3 + (expression vec3 * (var_ref x) (var_ref x)) (constant float (1))))))))) (signature vec4 (parameters (declare (in) vec4 x)) - ((return (expression vec4 log (expression vec4 + (var_ref x) (expression vec4 sqrt (expression vec4 + (expression vec4 * (var_ref x) (var_ref x)) (constant vec4 (1))))))))) + ((return (expression vec4 log (expression vec4 + (var_ref x) (expression vec4 sqrt (expression vec4 + (expression vec4 * (var_ref x) (var_ref x)) (constant float (1))))))))) )) diff --git a/src/glsl/builtins/ir/atanh b/src/glsl/builtins/ir/atanh index 5559e97..5ef3596 100644 --- a/src/glsl/builtins/ir/atanh +++ b/src/glsl/builtins/ir/atanh @@ -11,27 +11,27 @@ (signature vec2 (parameters (declare (in) vec2 x)) - ((return (expression vec2 * (constant vec2 (0.5)) + ((return (expression vec2 * (constant float (0.5)) (expression vec2 log (expression vec2 / - (expression vec2 + (constant vec2 (1)) (var_ref x)) - (expression vec2 - (constant vec2 (1)) (var_ref x)))))))) + (expression vec2 + (constant float (1)) (var_ref x)) + (expression vec2 - (constant float (1)) (var_ref x)))))))) (signature vec3 (parameters (declare (in) vec3 x)) - ((return (expression vec3 * (constant vec3 (0.5)) + ((return (expression vec3 * (constant float (0.5)) (expression vec3 log (expression vec3 / - (expression vec3 + (constant vec3 (1)) (var_ref x)) - (expression vec3 - (constant vec3 (1)) (var_ref x)))))))) + (expression vec3 + (constant float (1)) (var_ref x)) + (expression vec3 - (constant float (1)) (var_ref x)))))))) (signature vec4 (parameters (declare (in) vec4 x)) - ((return (expression vec4 * (constant vec4 (0.5)) + ((return (expression vec4 * (constant float (0.5)) (expression vec4 log (expression vec4 / - (expression vec4 + (constant vec4 (1)) (var_ref x)) - (expression vec4 - (constant vec4 (1)) (var_ref x)))))))) + (expression vec4 + (constant float (1)) (var_ref x)) + (expression vec4 - (constant float (1)) (var_ref x)))))))) )) diff --git a/src/glsl/builtins/ir/cosh b/src/glsl/builtins/ir/cosh index 45e0ae4..9457431 100644 --- a/src/glsl/builtins/ir/cosh +++ b/src/glsl/builtins/ir/cosh @@ -9,21 +9,21 @@ (signature vec2 (parameters (declare (in) vec2 x)) - ((return (expression vec2 * (constant vec2 (0.5)) + ((return (expression vec2 * (constant float (0.5)) (expression vec2 + (expression vec2 exp (var_ref x)) (expression vec2 exp (expression vec2 neg (var_ref x)))))))) (signature vec3 (parameters (declare (in) vec3 x)) - ((return (expression vec3 * (constant vec3 (0.5)) + ((return (expression vec3 * (constant float (0.5)) (expression vec3 + (expression vec3 exp (var_ref x)) (expression vec3 exp (expression vec3 neg (var_ref x)))))))) (signature vec4 (parameters (declare (in) vec4 x)) - ((return (expression vec4 * (constant vec4 (0.5)) + ((return (expression vec4 * (constant float (0.5)) (expression vec4 + (expression vec4 exp (var_ref x)) (expression vec4 exp (expression vec4 neg (var_ref x)))))))) diff --git a/src/glsl/builtins/ir/sinh b/src/glsl/builtins/ir/sinh index 7ad4f58..31edd30 100644 --- a/src/glsl/builtins/ir/sinh +++ b/src/glsl/builtins/ir/sinh @@ -9,21 +9,21 @@ (signature vec2 (parameters (declare (in) vec2 x)) - ((return (expression vec2 * (constant vec2 (0.5)) + ((return (expression vec2 * (constant float (0.5)) (expression vec2 - (expression vec2 exp (var_ref x)) (expression vec2 exp (expression vec2 neg (var_ref x)))))))) (signature vec3 (parameters (declare (in) vec3 x)) - ((return (expression vec3 * (constant vec3 (0.5)) + ((return (expression vec3 * (constant float (0.5)) (expression vec3 - (expression vec3 exp (var_ref x)) (expression vec3 exp (expression vec3 neg (var_ref x)))))))) (signature vec4 (parameters (declare (in) vec4 x)) - ((return (expression vec4 * (constant vec4 (0.5)) + ((return (expression vec4 * (constant float (0.5)) (expression vec4 - (expression vec4 exp (var_ref x)) (expression vec4 exp (expression vec4 neg (var_ref x)))))))) -- 1.7.6.1 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>>