diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-11-30 10:57:04 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-11-30 11:12:03 +0000 |
| commit | 5e04ded2bce4c135b57d391f5f4e24e030103e61 (patch) | |
| tree | 1e46077476e7d6644730cb18339b3d391fd7dcc9 | |
| parent | a8ea20100de5be45699e71eb6ba67bef546ad0cd (diff) | |
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@chris-wilson.co.uk>
| -rw-r--r-- | src/i915_render.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/i915_render.c b/src/i915_render.c index 34fd2538..438edccd 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; } |