Module: Mesa Branch: master Commit: 1f7e6e1e724150e5e7309bdb781d7873bcc13687 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1f7e6e1e724150e5e7309bdb781d7873bcc13687
Author: Kenneth Graunke <[email protected]> Date: Tue Sep 7 23:21:22 2010 -0700 glsl/builtins: Don't use ir_binop_dot on floating point values. ir_binop_dot is only defined for vector types. Use ir_binop_mul. --- src/glsl/builtins/ir/dot | 2 +- src/glsl/builtins/ir/faceforward | 2 +- src/glsl/builtins/ir/reflect | 2 +- src/glsl/builtins/ir/refract | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/glsl/builtins/ir/dot b/src/glsl/builtins/ir/dot index a91a6d2..1f27f32 100644 --- a/src/glsl/builtins/ir/dot +++ b/src/glsl/builtins/ir/dot @@ -3,7 +3,7 @@ (parameters (declare (in) float arg0) (declare (in) float arg1)) - ((return (expression float dot (var_ref arg0) (var_ref arg1))))) + ((return (expression float * (var_ref arg0) (var_ref arg1))))) (signature float (parameters diff --git a/src/glsl/builtins/ir/faceforward b/src/glsl/builtins/ir/faceforward index d170397..35b7957 100644 --- a/src/glsl/builtins/ir/faceforward +++ b/src/glsl/builtins/ir/faceforward @@ -4,7 +4,7 @@ (declare (in) float N) (declare (in) float I) (declare (in) float Nref)) - ((if (expression bool < (expression float dot (var_ref Nref) (var_ref I)) (constant float (0))) + ((if (expression bool < (expression float * (var_ref Nref) (var_ref I)) (constant float (0))) ((return (var_ref N))) ((return (expression float neg (var_ref N))))))) diff --git a/src/glsl/builtins/ir/reflect b/src/glsl/builtins/ir/reflect index 8238fdc..1fa394e 100644 --- a/src/glsl/builtins/ir/reflect +++ b/src/glsl/builtins/ir/reflect @@ -8,7 +8,7 @@ (expression float * (constant float (2.0)) (expression float * - (expression float dot + (expression float * (var_ref n) (var_ref i)) (var_ref n))))))) diff --git a/src/glsl/builtins/ir/refract b/src/glsl/builtins/ir/refract index d9dd822..f6319b0 100644 --- a/src/glsl/builtins/ir/refract +++ b/src/glsl/builtins/ir/refract @@ -11,8 +11,8 @@ (expression float * (var_ref eta) (expression float - (constant float (1.0)) (expression float * - (expression float dot (var_ref n) (var_ref i)) - (expression float dot (var_ref n) (var_ref i)))))))) + (expression float * (var_ref n) (var_ref i)) + (expression float * (var_ref n) (var_ref i)))))))) (if (expression bool < (var_ref k) (constant float (0.0))) ((return (constant float (0.0)))) ((return (expression float - @@ -20,7 +20,7 @@ (expression float * (expression float + (expression float * (var_ref eta) - (expression float dot (var_ref n) (var_ref i))) + (expression float * (var_ref n) (var_ref i))) (expression float sqrt (var_ref k))) (var_ref n)))))))) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
