diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-05-16 08:53:40 -0700 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2006-05-16 10:10:32 -0700 |
| commit | 01c043de0393170e98515169f8239fef4d3e2053 (patch) | |
| tree | fb639d80dc12d836c02ef6cc6265e92dd6637765 /src/i830_video.c | |
| parent | db3683907d15959e79adfb8f0cd94e861fae5c36 (diff) | |
Use linear min/mag blending.
Diffstat (limited to 'src/i830_video.c')
| -rw-r--r-- | src/i830_video.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index 11c022a9..99bb5338 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -2317,8 +2317,11 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, OUT_RING(STATE3D_SAMPLER_STATE | 3); OUT_RING(0x00000001); - OUT_RING(SS2_COLORSPACE_CONVERSION); - OUT_RING(0x00000000); + OUT_RING(SS2_COLORSPACE_CONVERSION | + (FILTER_LINEAR << SS2_MAG_FILTER_SHIFT) | + (FILTER_LINEAR << SS2_MIN_FILTER_SHIFT)); + OUT_RING((TEXCOORDMODE_CLAMP_EDGE << SS3_TCX_ADDR_MODE_SHIFT) | + (TEXCOORDMODE_CLAMP_EDGE << SS3_TCY_ADDR_MODE_SHIFT)); OUT_RING(0x00000000); OUT_RING(STATE3D_MAP_STATE | 3); @@ -2444,16 +2447,22 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, OUT_RING(0x00000007); /* sampler 0 */ OUT_RING(0x00000000); - OUT_RING(0x00000000); - OUT_RING(0x00000000); + OUT_RING((FILTER_LINEAR << SS2_MAG_FILTER_SHIFT) | + (FILTER_LINEAR << SS2_MIN_FILTER_SHIFT)); + OUT_RING((TEXCOORDMODE_CLAMP_EDGE << SS3_TCX_ADDR_MODE_SHIFT) | + (TEXCOORDMODE_CLAMP_EDGE << SS3_TCY_ADDR_MODE_SHIFT)); /* sampler 1 */ OUT_RING(0x00000000); - OUT_RING(0x00000000); - OUT_RING(0x00000000); + OUT_RING((FILTER_LINEAR << SS2_MAG_FILTER_SHIFT) | + (FILTER_LINEAR << SS2_MIN_FILTER_SHIFT)); + OUT_RING((TEXCOORDMODE_CLAMP_EDGE << SS3_TCX_ADDR_MODE_SHIFT) | + (TEXCOORDMODE_CLAMP_EDGE << SS3_TCY_ADDR_MODE_SHIFT)); /* sampler 2 */ OUT_RING(0x00000000); - OUT_RING(0x00000000); - OUT_RING(0x00000000); + OUT_RING((FILTER_LINEAR << SS2_MAG_FILTER_SHIFT) | + (FILTER_LINEAR << SS2_MIN_FILTER_SHIFT)); + OUT_RING((TEXCOORDMODE_CLAMP_EDGE << SS3_TCX_ADDR_MODE_SHIFT) | + (TEXCOORDMODE_CLAMP_EDGE << SS3_TCY_ADDR_MODE_SHIFT)); OUT_RING(STATE3D_MAP_STATE | 9); OUT_RING(0x00000007); |