diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2007-03-13 19:23:32 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2007-03-13 19:23:32 +0000 |
| commit | 8fd1af065ae7107d4f8be11716f3162dfea35bd7 (patch) | |
| tree | da839cf164f3bacb42c44b6de58a595fcdac70c9 | |
| parent | e2b8400e4e8159b220ea2dfc8f1efdd3f7bdc307 (diff) | |
More fixes.
Need to emit some packets at least once, even if their state isn't active.
| -rw-r--r-- | src/mesa/drivers/dri/i915tex/i915_state_map.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915tex/i915_state_sampler.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i915tex/i915_state_map.c b/src/mesa/drivers/dri/i915tex/i915_state_map.c index 2f3bae738a..ea01c54777 100644 --- a/src/mesa/drivers/dri/i915tex/i915_state_map.c +++ b/src/mesa/drivers/dri/i915tex/i915_state_map.c @@ -160,8 +160,8 @@ upload_maps( struct intel_context *intel ) OUT_BATCH(0); } - OUT_BATCH(state[i][3]); - OUT_BATCH(state[i][4]); + OUT_BATCH(state[i][0]); + OUT_BATCH(state[i][1]); } } ADVANCE_BATCH(); diff --git a/src/mesa/drivers/dri/i915tex/i915_state_sampler.c b/src/mesa/drivers/dri/i915tex/i915_state_sampler.c index f4dc241cf8..5eba939e46 100644 --- a/src/mesa/drivers/dri/i915tex/i915_state_sampler.c +++ b/src/mesa/drivers/dri/i915tex/i915_state_sampler.c @@ -86,6 +86,7 @@ static void update_sampler(struct intel_context *intel, */ struct gl_texture_image *firstImage = tObj->Image[0][intelObj->firstLevel]; + state[0] = state[1] = state[2] = 0; { GLuint minFilt, mipFilt, magFilt; @@ -206,7 +207,7 @@ static void update_sampler(struct intel_context *intel, (unit << SS3_TEXTUREMAP_INDEX_SHIFT)); /* Or some field in tObj? */ - if (intel->state.Texture->Unit[unit]._ReallyEnabled == TEXTURE_RECT_BIT) + if (intel->state.Texture->Unit[unit]._ReallyEnabled != TEXTURE_RECT_BIT) state[1] |= SS3_NORMALIZED_COORDS; } |