summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nv50/nv50_tex.c
diff options
context:
space:
mode:
authorBen Skeggs <[email protected]>2011-03-01 12:26:20 +1000
committerBen Skeggs <[email protected]>2011-03-01 14:44:43 +1000
commit79079141fa7cbf395d1ffc77364ac301d9824211 (patch)
treef891d7925be9edf943827cf3d702dcdb94378419 /src/gallium/drivers/nv50/nv50_tex.c
parent5c1c4f8593073c0bad9bada9234657dda1b25ff0 (diff)
nv50: move onto common linear buffer manager
Signed-off-by: Ben Skeggs <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_tex.c')
-rw-r--r--src/gallium/drivers/nv50/nv50_tex.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/drivers/nv50/nv50_tex.c b/src/gallium/drivers/nv50/nv50_tex.c
index 93e74ca0597..eaee0a1107f 100644
--- a/src/gallium/drivers/nv50/nv50_tex.c
+++ b/src/gallium/drivers/nv50/nv50_tex.c
@@ -168,7 +168,7 @@ nv50_validate_tic(struct nv50_context *nv50, int s)
for (i = 0; i < nv50->num_textures[s]; ++i) {
struct nv50_tic_entry *tic = nv50_tic_entry(nv50->textures[s][i]);
- struct nv50_resource *res;
+ struct nv04_resource *res;
if (!tic) {
BEGIN_RING(chan, RING_3D(BIND_TIC(s)), 1);
@@ -261,8 +261,9 @@ nv50_validate_tsc(struct nv50_context *nv50, int s)
if (tsc->id < 0) {
tsc->id = nv50_screen_tsc_alloc(nv50->screen, tsc);
- nv50_sifc_linear_u8(nv50, nv50->screen->txc, NOUVEAU_BO_VRAM,
- 65536 + tsc->id * 32, 32, tsc->tsc);
+ nv50_sifc_linear_u8(&nv50->pipe, nv50->screen->txc,
+ 65536 + tsc->id * 32,
+ NOUVEAU_BO_VRAM, 32, tsc->tsc);
need_flush = TRUE;
}
nv50->screen->tsc.lock[tsc->id / 32] |= 1 << (tsc->id % 32);