diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-03-23 14:18:06 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-03-23 14:18:06 +1100 |
| commit | dcf04ee23c0131c2a3fdb267d132d6b27db393c4 (patch) | |
| tree | d1a3fa9823f28c37dc8d7d8649d68e2f9a7c4b47 /src/gallium/drivers/i915simple | |
| parent | 75b85fd33abe143d9cca6f8405f0a4243b6a5ddb (diff) | |
| parent | a35c1ca3ad4361fee30d21ef13d8d37ae91aee66 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/drivers/i915simple')
| -rw-r--r-- | src/gallium/drivers/i915simple/i915_state_sampler.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gallium/drivers/i915simple/i915_state_sampler.c b/src/gallium/drivers/i915simple/i915_state_sampler.c index 9dbb1b1b23..84f6529a3a 100644 --- a/src/gallium/drivers/i915simple/i915_state_sampler.c +++ b/src/gallium/drivers/i915simple/i915_state_sampler.c @@ -206,6 +206,12 @@ i915_update_texture(struct i915_context *i915, uint unit, | format | MS3_USE_FENCE_REGS); + /* + * XXX sampler->max_lod should be used to program the MAX_LOD field below. + * Also, when min_filter != mag_filter and there's just one mipmap level, + * set max_lod = 1 to make sure i915 chooses between min/mag filtering. + */ + /* MS4 state */ state[1] = ((((pitch / 4) - 1) << MS4_PITCH_SHIFT) |