diff options
| author | Zou Nan hai <nanhai.zou@intel.com> | 2007-10-26 15:39:50 +0800 |
|---|---|---|
| committer | Zou Nan hai <nanhai.zou@intel.com> | 2007-10-26 15:39:50 +0800 |
| commit | 6ef27b88e6f767cd476676b33cb7c4ea6922234e (patch) | |
| tree | 463d6a70b986cb62b3516ef6fd8e691f680f30ea /src/mesa/drivers/dri/i965/brw_vs_tnl.c | |
| parent | ff042bfdeeeb0a3d658d5ab1dbdcac7b67aac0f8 (diff) | |
| parent | de803f538c16096c9e241cfdddc092ac2aa2504e (diff) | |
Merge branch '965-glsl'
Conflicts:
src/mesa/drivers/dri/i965/brw_sf.h
src/mesa/drivers/dri/i965/intel_context.c
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_vs_tnl.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vs_tnl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vs_tnl.c b/src/mesa/drivers/dri/i965/brw_vs_tnl.c index 27210d1a37..aecdd4bc31 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_tnl.c +++ b/src/mesa/drivers/dri/i965/brw_vs_tnl.c @@ -855,7 +855,7 @@ static struct ureg calculate_light_attenuation( struct tnl_program *p, struct ureg slt = get_temp(p); emit_op2(p, OPCODE_DP3, spot, 0, ureg_negate(VPpli), spot_dir_norm); - emit_op2(p, OPCODE_SLT, slt, 0, swizzle1(spot_dir_norm,W), spot); + emit_op2(p, OPCODE_SLT, slt, 0, spot, swizzle1(spot_dir_norm,W)); emit_op2(p, OPCODE_POW, spot, 0, spot, swizzle1(attenuation, W)); emit_op2(p, OPCODE_MUL, att, 0, slt, spot); |