summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nv40/nv40_fragtex.c
diff options
context:
space:
mode:
authorBen Skeggs <darktama@beleth.(none)>2008-02-22 13:55:18 +1100
committerBen Skeggs <darktama@beleth.(none)>2008-02-22 13:55:18 +1100
commitc2e36bdd1a58ba6f58c4e72db1f7f64e8bd05901 (patch)
treedc29ce26e4cfc6ea5e5c20e57563c83985d91c73 /src/gallium/drivers/nv40/nv40_fragtex.c
parent5b2ff28a2fd3bb0ca9df569edcaf80e8141ccaa1 (diff)
nv40: move hw_dirty
Diffstat (limited to 'src/gallium/drivers/nv40/nv40_fragtex.c')
-rw-r--r--src/gallium/drivers/nv40/nv40_fragtex.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gallium/drivers/nv40/nv40_fragtex.c b/src/gallium/drivers/nv40/nv40_fragtex.c
index 826d4a9478a..3d27a9bf134 100644
--- a/src/gallium/drivers/nv40/nv40_fragtex.c
+++ b/src/gallium/drivers/nv40/nv40_fragtex.c
@@ -124,10 +124,11 @@ static boolean
nv40_fragtex_validate(struct nv40_context *nv40)
{
struct nv40_fragment_program *fp = nv40->pipe_state.fragprog;
+ struct nv40_state *state = &nv40->state;
struct nouveau_stateobj *so;
unsigned samplers, unit;
- samplers = nv40->fp_samplers & ~fp->samplers;
+ samplers = state->fp_samplers & ~fp->samplers;
while (samplers) {
unit = ffs(samplers) - 1;
samplers &= ~(1 << unit);
@@ -137,7 +138,7 @@ nv40_fragtex_validate(struct nv40_context *nv40)
so_data (so, 0);
so_ref(so, &nv40->state.hw[NV40_STATE_FRAGTEX0 + unit]);
so_ref(NULL, &so);
- nv40->hw_dirty |= (1 << (NV40_STATE_FRAGTEX0 + unit));
+ state->dirty |= (1 << (NV40_STATE_FRAGTEX0 + unit));
}
samplers = nv40->dirty_samplers & fp->samplers;
@@ -148,10 +149,10 @@ nv40_fragtex_validate(struct nv40_context *nv40)
so = nv40_fragtex_build(nv40, unit);
so_ref(so, &nv40->state.hw[NV40_STATE_FRAGTEX0 + unit]);
so_ref(NULL, &so);
- nv40->hw_dirty |= (1 << (NV40_STATE_FRAGTEX0 + unit));
+ state->dirty |= (1 << (NV40_STATE_FRAGTEX0 + unit));
}
- nv40->fp_samplers = fp->samplers;
+ nv40->state.fp_samplers = fp->samplers;
return FALSE;
}