diff options
| author | Christian König <[email protected]> | 2011-01-20 22:10:37 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-20 22:10:37 +0100 |
| commit | d2ff6b8715e817c1ef14d4bf12be58c19d894143 (patch) | |
| tree | 281badfe8638da50221270af29e16da1e40d9a6a /src/glsl/builtins/ir/refract | |
| parent | e755c7bec3bc722ee451bdaed8da741f337d33b3 (diff) | |
| parent | d136d1d2e1174d2420ce5e32507904243ab240cd (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_shader.c
Diffstat (limited to 'src/glsl/builtins/ir/refract')
| -rw-r--r-- | src/glsl/builtins/ir/refract | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glsl/builtins/ir/refract b/src/glsl/builtins/ir/refract index f6319b0ed47..60899f01cec 100644 --- a/src/glsl/builtins/ir/refract +++ b/src/glsl/builtins/ir/refract @@ -5,7 +5,7 @@ (declare (in) float n) (declare (in) float eta)) ((declare () float k) - (assign (constant bool (1)) (x) (var_ref k) + (assign (x) (var_ref k) (expression float - (constant float (1.0)) (expression float * (var_ref eta) (expression float * (var_ref eta) @@ -30,7 +30,7 @@ (declare (in) vec2 n) (declare (in) float eta)) ((declare () float k) - (assign (constant bool (1)) (x) (var_ref k) + (assign (x) (var_ref k) (expression float - (constant float (1.0)) (expression float * (var_ref eta) (expression float * (var_ref eta) @@ -55,7 +55,7 @@ (declare (in) vec3 n) (declare (in) float eta)) ((declare () float k) - (assign (constant bool (1)) (x) (var_ref k) + (assign (x) (var_ref k) (expression float - (constant float (1.0)) (expression float * (var_ref eta) (expression float * (var_ref eta) @@ -80,7 +80,7 @@ (declare (in) vec4 n) (declare (in) float eta)) ((declare () float k) - (assign (constant bool (1)) (x) (var_ref k) + (assign (x) (var_ref k) (expression float - (constant float (1.0)) (expression float * (var_ref eta) (expression float * (var_ref eta) |