diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-03-03 20:06:08 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-03-04 00:04:21 +0000 |
| commit | 1f2daf652480ef768f847467d9171b5e4a7f01a3 (patch) | |
| tree | b5f58033f726a175a4ae00a4af33f26d6be4e1c2 /src/drm | |
| parent | cdaef58c19a191632473fcbbe688e6231c02b9b2 (diff) | |
drm/i915: Avoid double multiplication of linear alpha.
Diffstat (limited to 'src/drm')
| -rw-r--r-- | src/drm/cairo-drm-i915-shader.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/drm/cairo-drm-i915-shader.c b/src/drm/cairo-drm-i915-shader.c index 9c9dac08..65873d9b 100644 --- a/src/drm/cairo-drm-i915-shader.c +++ b/src/drm/cairo-drm-i915-shader.c @@ -640,7 +640,7 @@ i915_set_shader_program (i915_device_t *device, /* XXX can we defer premultiplication? */ i915_fs_mul (out_reg, i915_fs_operand_reg (FS_U3), - i915_fs_operand (FS_U3, W, W, W, W)); + i915_fs_operand (FS_U3, W, W, W, ONE)); constant_offset += 2; texture_offset += 1; @@ -711,11 +711,7 @@ i915_set_shader_program (i915_device_t *device, FS_T0 + texture_offset, /* input */ FS_C0 + constant_offset, FS_C0 + constant_offset + 1, /* colour ramp */ - FS_U3); /* unpremultiplied output */ - i915_fs_mul (FS_R1, - i915_fs_operand_reg (FS_U3), - i915_fs_operand (source_reg, W, W, W, W)); - + FS_R1); /* unpremultiplied output */ constant_offset += 2; texture_offset += 1; mask_reg = FS_R1; |