xf86-video-intel: 2 commits - src/i915_render.c
Chris Wilson
ickle at kemper.freedesktop.org
Mon Nov 30 03:15:10 PST 2009
src/i915_render.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
New commits:
commit b118a52cd1a006321571967bd5f6c2a9e674de3a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Nov 30 11:03:32 2009 +0000
i915: Remove routing of alpha channel to green.
This modification is redundant since the routing is done in the blend
unit anyway.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/i915_render.c b/src/i915_render.c
index 438edcc..0a260f3 100644
--- a/src/i915_render.c
+++ b/src/i915_render.c
@@ -382,12 +382,6 @@ i915_prepare_composite(int op, PicturePtr source_picture,
PICT_a8r8g8b8,
&intel->render_source_solid))
return FALSE;
-
- /* route alpha to the green channel when using a8 targets */
- if (dest_picture->format == PICT_a8) {
- intel->render_source_solid >>= 24;
- intel->render_source_solid *= 0x01010101;
- }
} else if (!intel_check_pitch_3d(source))
return FALSE;
@@ -405,12 +399,6 @@ i915_prepare_composite(int op, PicturePtr source_picture,
PICT_a8r8g8b8,
&intel->render_mask_solid))
return FALSE;
-
- /* route alpha to the green channel when using a8 targets */
- if (dest_picture->format == PICT_a8) {
- intel->render_mask_solid >>= 24;
- intel->render_mask_solid *= 0x01010101;
- }
} else if (!intel_check_pitch_3d(mask))
return FALSE;
}
commit 5e04ded2bce4c135b57d391f5f4e24e030103e61
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Nov 30 10:57:04 2009 +0000
i915: Fix missing texture offset for mask.
In commit e581ceb, I modified the shader generation to accommodate mixed
textures and solids but missed applying the new computed sampler for the
mask.
References:
Bug 23803 [bisected i915] gnome characters disappear
http://bugs.freedesktop.org/show_bug.cgi?id=23803
Bug 25031 rendering and color corruption since 14109abf
http://bugs.freedesktop.org/show_bug.cgi?id=25031
Bug 25047 [945GM bisected] rendercheck/repeat/triangles regressed
http://bugs.freedesktop.org/show_bug.cgi?id=25047
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/i915_render.c b/src/i915_render.c
index 34fd253..438edcc 100644
--- a/src/i915_render.c
+++ b/src/i915_render.c
@@ -641,15 +641,15 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn)
if (! is_solid_mask) {
/* Load the mask_picture texel */
if (is_affine_mask) {
- i915_fs_texld(FS_R1, FS_S0, FS_T0 + t);
+ i915_fs_texld(FS_R1, FS_S0 + t, FS_T0 + t);
} else {
- i915_fs_texldp(FS_R1, FS_S0, FS_T0 + t);
+ i915_fs_texldp(FS_R1, FS_S0 + t, FS_T0 + t);
}
/* If the texture lacks an alpha channel, force the alpha to 1.
*/
if (PICT_FORMAT_A(mask_picture->format) == 0)
i915_fs_mov_masked(FS_R1, MASK_W,
- i915_fs_operand_one());
+ i915_fs_operand_one());
mask_reg = FS_R1;
}
More information about the xorg-commit
mailing list