fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 13:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl/builtins: Fix invalid vecN constants in hyperbolic functions.

Browse source 
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 <kenneth@whitecape.org>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Kenneth Graunke 2011-09-05 12:20:18 -07:00
parent 99c1a58b30
commit f6481be298
5 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/glsl/builtins/ir/acosh
View file

@ -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)))))))))
))

6
src/glsl/builtins/ir/asinh
View file

@ -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)))))))))
))

18
src/glsl/builtins/ir/atanh
View file

@ -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))))))))
))

6
src/glsl/builtins/ir/cosh
View file

@ -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))))))))

6
src/glsl/builtins/ir/sinh
View file

@ -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))))))))