diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-12-23 14:03:49 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-04-14 02:56:12 +1000 |
| commit | 2e47d01c9e5325906cf3bb979279599991c6328e (patch) | |
| tree | 03f161f671bf350d5455669679c98c46192f9be6 /src/mesa/drivers/dri/nouveau/nouveau_scratch.c | |
| parent | 7308b6e75fe64f4e3f318bc7b5d276585e4f6957 (diff) | |
| download | external_mesa3d-2e47d01c9e5325906cf3bb979279599991c6328e.zip external_mesa3d-2e47d01c9e5325906cf3bb979279599991c6328e.tar.gz external_mesa3d-2e47d01c9e5325906cf3bb979279599991c6328e.tar.bz2 | |
nouveau/vieux: switch to libdrm_nouveau-2.0
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_scratch.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_scratch.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_scratch.c b/src/mesa/drivers/dri/nouveau/nouveau_scratch.c index ddda67b..b54f90f 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_scratch.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_scratch.c @@ -35,6 +35,7 @@ void * nouveau_get_scratch(struct gl_context *ctx, unsigned size, struct nouveau_bo **bo, unsigned *offset) { + struct nouveau_client *client = context_client(ctx); struct nouveau_scratch_state *scratch = &to_nouveau_context(ctx)->scratch; void *buf; @@ -50,20 +51,18 @@ nouveau_get_scratch(struct gl_context *ctx, unsigned size, scratch->index = (scratch->index + 1) % NOUVEAU_SCRATCH_COUNT; nouveau_bo_ref(scratch->bo[scratch->index], bo); - nouveau_bo_map(*bo, NOUVEAU_BO_WR); + nouveau_bo_map(*bo, NOUVEAU_BO_WR, client); buf = scratch->buf = (*bo)->map; - nouveau_bo_unmap(*bo); *offset = 0; scratch->offset = size; } else { - nouveau_bo_new(context_dev(ctx), - NOUVEAU_BO_MAP | NOUVEAU_BO_GART, 0, size, bo); + nouveau_bo_new(context_dev(ctx), NOUVEAU_BO_GART | + NOUVEAU_BO_MAP, 0, size, NULL, bo); - nouveau_bo_map(*bo, NOUVEAU_BO_WR); + nouveau_bo_map(*bo, NOUVEAU_BO_WR, client); buf = (*bo)->map; - nouveau_bo_unmap(*bo); *offset = 0; } @@ -79,9 +78,9 @@ nouveau_scratch_init(struct gl_context *ctx) int ret, i; for (i = 0; i < NOUVEAU_SCRATCH_COUNT; i++) { - ret = nouveau_bo_new(context_dev(ctx), - NOUVEAU_BO_MAP | NOUVEAU_BO_GART, - 0, NOUVEAU_SCRATCH_SIZE, &scratch->bo[i]); + ret = nouveau_bo_new(context_dev(ctx), NOUVEAU_BO_GART | + NOUVEAU_BO_MAP, 0, NOUVEAU_SCRATCH_SIZE, + NULL, &scratch->bo[i]); assert(!ret); } } |