diff options
| author | Christoph Bumiller <[email protected]> | 2010-01-23 18:35:27 +0100 |
|---|---|---|
| committer | Christoph Bumiller <[email protected]> | 2010-01-24 15:17:53 +0100 |
| commit | 49dde55b96f717171a9dc6facd800e1c4be6eedf (patch) | |
| tree | 085ca3ceea8ffa8ba053f30db5b9904085c40b16 | |
| parent | d6fd31a8d47b6cc70b5e64757e1272ccc6594350 (diff) | |
nv50: only flush texture caches on st request
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_context.c | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_tex.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c index 1e697463221..e2198b189da 100644 --- a/src/gallium/drivers/nv50/nv50_context.c +++ b/src/gallium/drivers/nv50/nv50_context.c @@ -34,6 +34,11 @@ nv50_flush(struct pipe_context *pipe, unsigned flags, struct nv50_context *nv50 = nv50_context(pipe); struct nouveau_channel *chan = nv50->screen->base.channel; + if (flags & PIPE_FLUSH_TEXTURE_CACHE) { + BEGIN_RING(chan, nv50->screen->tesla, 0x1338, 1); + OUT_RING (chan, 0x20); + } + if (flags & PIPE_FLUSH_FRAME) FIRE_RING(chan); } diff --git a/src/gallium/drivers/nv50/nv50_tex.c b/src/gallium/drivers/nv50/nv50_tex.c index 871536dca9b..9f1a1713032 100644 --- a/src/gallium/drivers/nv50/nv50_tex.c +++ b/src/gallium/drivers/nv50/nv50_tex.c @@ -220,11 +220,8 @@ nv50_tex_validate(struct nv50_context *nv50) return; } - /* not sure if the following really do what I think: */ so_method(so, tesla, 0x1330, 1); /* flush TIC */ so_data (so, 0); - so_method(so, tesla, 0x1338, 1); /* flush texture caches */ - so_data (so, 0x20); so_ref(so, &nv50->state.tic_upload); so_ref(NULL, &so); |