diff options
| author | Marek Olšák <maraeo@gmail.com> | 2011-06-09 04:09:40 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2011-06-09 04:19:03 +0200 |
| commit | da8b4c07986e202b0596b729a5eec31c9aec5fcc (patch) | |
| tree | b412be80bc42d520c21f887fc299269caa28b122 /src/gallium/drivers/r300/r300_state_derived.c | |
| parent | 466ce95ddff734d5090bcb1c5ada7a4f23e13226 (diff) | |
| download | external_mesa3d-da8b4c07986e202b0596b729a5eec31c9aec5fcc.zip external_mesa3d-da8b4c07986e202b0596b729a5eec31c9aec5fcc.tar.gz external_mesa3d-da8b4c07986e202b0596b729a5eec31c9aec5fcc.tar.bz2 | |
r300g: fix texturing with non-3D textures and wrap R mode set to sample border
If the wrap R (3rd) mode is set to CLAMP or CLAMP_TO_BORDER and the texture
isn't 3D, r300 always samples the border color regardless of texture
coordinates.
I HATE THIS HARDWARE.
NOTE: This is a candidate for the 7.10 branch.
Diffstat (limited to 'src/gallium/drivers/r300/r300_state_derived.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_state_derived.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c index 121409b..f63114e 100644 --- a/src/gallium/drivers/r300/r300_state_derived.c +++ b/src/gallium/drivers/r300/r300_state_derived.c @@ -854,6 +854,12 @@ static void r300_merge_textures_and_samplers(struct r300_context* r300) texstate->filter0 |= R300_TX_WRAP_T(R300_TX_CLAMP_TO_EDGE); } + /* The hardware doesn't like CLAMP and CLAMP_TO_BORDER + * for the 3rd coordinate if the texture isn't 3D. */ + if (tex->b.b.b.target != PIPE_TEXTURE_3D) { + texstate->filter0 &= ~R300_TX_WRAP_R_MASK; + } + if (tex->tex.is_npot) { /* NPOT textures don't support mip filter, unfortunately. * This prevents incorrect rendering. */ |