diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-02-26 16:08:09 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-02-26 22:00:47 +0100 |
| commit | c75deddc9316d3a7a3981f875b9518bbbce2753c (patch) | |
| tree | b39221b4aa7e8d8eeb07b442211d0868f335cf56 | |
| parent | 1cb6a741347968ebb9ef0262ee047e11eb1242c1 (diff) | |
i915g: clean up sampler<->map hw state emit interdependancy
Sampler/map are connected via the lod-bias (see comments in
i915_state_sampler.c). Now update_samplers in that file is
called for I915_NEW_SAMPLER | I915_NEW_SAMPLER_VIEW and dirties
both I915_HW_SAMPLER and I915_HW_MAP (and sets the correct state)
so this check is superflous. And confusing, because the hw sampler
state is handled below.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | src/gallium/drivers/i915/i915_state_emit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/i915/i915_state_emit.c b/src/gallium/drivers/i915/i915_state_emit.c index 7534963c16..eab7a5449d 100644 --- a/src/gallium/drivers/i915/i915_state_emit.c +++ b/src/gallium/drivers/i915/i915_state_emit.c @@ -306,7 +306,7 @@ i915_emit_hardware_state(struct i915_context *i915 ) #if 01 /* texture images */ /* 2 + I915_TEX_UNITS*3 dwords, I915_TEX_UNITS relocs */ - if (i915->hardware_dirty & (I915_HW_MAP | I915_HW_SAMPLER)) + if (i915->hardware_dirty & (I915_HW_MAP)) { const uint nr = i915->current.sampler_enable_nr; if (nr) { |