summaryrefslogtreecommitdiff
path: root/r600_batch.c
diff options
context:
space:
mode:
Diffstat (limited to 'r600_batch.c')
-rw-r--r--r600_batch.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/r600_batch.c b/r600_batch.c
index a322430..2349145 100644
--- a/r600_batch.c
+++ b/r600_batch.c
@@ -95,7 +95,6 @@ static int r600_batch_alloc(struct r600_batch **batch)
INIT_LIST_HEAD(&rbatch->pre_flushes);
INIT_LIST_HEAD(&rbatch->post_flushes);
rbatch->nemit_atoms = 0;
- rbatch->shaders_idx = 0;
rbatch->nfs_resources = 0;
*batch = rbatch;
return 0;
@@ -146,8 +145,6 @@ static void r600_batches_clear_locked(struct radeon_device *rdev, struct r600_ba
radeon_atom_flush_cleanup(&batch->pre_flushes);
radeon_atom_flush_cleanup(&batch->post_flushes);
list_del(&batch->list);
- radeon_bo_unmap(batch->shaders);
- radeon_bo_unref(batch->shaders);
free(batch);
}
INIT_LIST_HEAD(&batches->batches);
@@ -179,8 +176,6 @@ static int r600_batches_flush_locked(struct radeon_device *rdev, struct r600_bat
list_for_each_entry(flush, &batch->pre_flushes, list) {
r600_emit_flush(rdev, batches->ib, flush->bo, flush->flags);
}
- /* FIXME shader flush should be conditional */
- r600_emit_flush(rdev, batches->ib, batch->shaders, 0x08000000);
for (i = 0; i < batch->nemit_atoms; i++) {
r = batch->emit_atoms[i]->emit(rdev, batch->emit_atoms[i], batch, batches->ib);
if (r)
@@ -225,18 +220,6 @@ int r600_batches_queue(struct radeon_device *rdev, struct r600_request *rq)
fprintf(stderr, "invalid batch\n");
return -EINVAL;
}
- rbatch->shaders = radeon_bo_open(rdev->bom, 0, 4096 * 16, 0, RADEON_GEM_DOMAIN_GTT, 0);
- if (rbatch->shaders == NULL) {
- free(rbatch);
- fprintf(stderr, "can't create buffer for shaders\n");
- return -ENOMEM;
- }
- r = radeon_bo_map(rbatch->shaders, 1);
- if (r) {
- free(rbatch);
- fprintf(stderr, "can't map buffer for shaders\n");
- return r;
- }
rbatch->atoms[i++] = batch->blend; kref_get(&batch->blend->kref);
rbatch->atoms[i++] = batch->cb_cntl; kref_get(&batch->cb_cntl->kref);
rbatch->atoms[i++] = batch->pa; kref_get(&batch->pa->kref);
@@ -320,8 +303,6 @@ out_err:
if (rbatch->atoms[i])
radeon_atom_put(rbatch->atoms[i]);
}
- radeon_bo_unmap(rbatch->shaders);
- radeon_bo_unref(rbatch->shaders);
free(rbatch);
return r;
}