summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-07-07 14:53:43 -0700
committerEric Anholt <eric@anholt.net>2010-07-07 14:55:33 -0700
commit0b74bbb3dcf07489e1dbd1976f07093ad7821e51 (patch)
treed18a9c8ac1b4d8591584fc5d2fcf743b52043a1b /src
parent9cbd8a1d5a85f39f12e9edbd2defbb9e9d0468ef (diff)
glsl: Fix the setup of refract()'s output for vec3/vec4 and k < 0.0.
caught by valgrind.
Diffstat (limited to 'src')
-rw-r--r--src/glsl/builtin_function.cpp4
-rw-r--r--src/glsl/builtins/110/refract4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/glsl/builtin_function.cpp b/src/glsl/builtin_function.cpp
index 40c85e7c98..5b3b49d310 100644
--- a/src/glsl/builtin_function.cpp
+++ b/src/glsl/builtin_function.cpp
@@ -1808,7 +1808,7 @@ static const char *builtins_110_refract = {
" (expression float dot (var_ref n) (var_ref i))\n"
" (expression float dot (var_ref n) (var_ref i))))))))\n"
" (if (expression bool < (var_ref k) (constant float (0.0)))\n"
- " ((return (constant vec3 (0.0 0.0))))\n"
+ " ((return (constant vec3 (0.0 0.0 0.0))))\n"
" ((return (expression vec3 -\n"
" (expression vec3 * (var_ref eta) (var_ref i))\n"
" (expression vec3 *\n"
@@ -1833,7 +1833,7 @@ static const char *builtins_110_refract = {
" (expression float dot (var_ref n) (var_ref i))\n"
" (expression float dot (var_ref n) (var_ref i))))))))\n"
" (if (expression bool < (var_ref k) (constant float (0.0)))\n"
- " ((return (constant vec4 (0.0 0.0))))\n"
+ " ((return (constant vec4 (0.0 0.0 0.0 0.0))))\n"
" ((return (expression vec4 -\n"
" (expression vec4 * (var_ref eta) (var_ref i))\n"
" (expression vec4 *\n"
diff --git a/src/glsl/builtins/110/refract b/src/glsl/builtins/110/refract
index e9b1475294..522ab41173 100644
--- a/src/glsl/builtins/110/refract
+++ b/src/glsl/builtins/110/refract
@@ -64,7 +64,7 @@
(expression float dot (var_ref n) (var_ref i))
(expression float dot (var_ref n) (var_ref i))))))))
(if (expression bool < (var_ref k) (constant float (0.0)))
- ((return (constant vec3 (0.0 0.0))))
+ ((return (constant vec3 (0.0 0.0 0.0))))
((return (expression vec3 -
(expression vec3 * (var_ref eta) (var_ref i))
(expression vec3 *
@@ -89,7 +89,7 @@
(expression float dot (var_ref n) (var_ref i))
(expression float dot (var_ref n) (var_ref i))))))))
(if (expression bool < (var_ref k) (constant float (0.0)))
- ((return (constant vec4 (0.0 0.0))))
+ ((return (constant vec4 (0.0 0.0 0.0 0.0))))
((return (expression vec4 -
(expression vec4 * (var_ref eta) (var_ref i))
(expression vec4 *