summaryrefslogtreecommitdiff
path: root/src/gallium/winsys
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-10-05 15:57:57 +1000
committerDave Airlie <airlied@redhat.com>2010-10-05 15:57:57 +1000
commit46997d4fc27e62a1c479f25f5f441b95e6d5cb64 (patch)
treed69fbbad3048f234a1d328bf10bd945ac429cc70 /src/gallium/winsys
parent05813ad5f440a33cc7e222982a120f62028aa887 (diff)
r600g: drop mman allocator
we don't use this since constant buffers are now being used on all gpus.
Diffstat (limited to 'src/gallium/winsys')
-rw-r--r--src/gallium/winsys/r600/drm/r600_bo.c4
-rw-r--r--src/gallium/winsys/r600/drm/r600_drm.c4
-rw-r--r--src/gallium/winsys/r600/drm/r600_priv.h1
3 files changed, 1 insertions, 8 deletions
diff --git a/src/gallium/winsys/r600/drm/r600_bo.c b/src/gallium/winsys/r600/drm/r600_bo.c
index 8089c91640..9498f3a82e 100644
--- a/src/gallium/winsys/r600/drm/r600_bo.c
+++ b/src/gallium/winsys/r600/drm/r600_bo.c
@@ -39,9 +39,7 @@ struct r600_bo *r600_bo(struct radeon *radeon,
desc.usage = usage;
ws_bo->size = size;
- if (!radeon->use_mem_constant && (usage & PIPE_BIND_CONSTANT_BUFFER)) {
- man = radeon->mman;
- } else if (usage & (PIPE_BIND_CONSTANT_BUFFER | PIPE_BIND_VERTEX_BUFFER | PIPE_BIND_INDEX_BUFFER))
+ if (usage & (PIPE_BIND_CONSTANT_BUFFER | PIPE_BIND_VERTEX_BUFFER | PIPE_BIND_INDEX_BUFFER))
man = radeon->cman;
else
man = radeon->kman;
diff --git a/src/gallium/winsys/r600/drm/r600_drm.c b/src/gallium/winsys/r600/drm/r600_drm.c
index 31fb7d4e0f..5f175a4df9 100644
--- a/src/gallium/winsys/r600/drm/r600_drm.c
+++ b/src/gallium/winsys/r600/drm/r600_drm.c
@@ -157,9 +157,6 @@ struct radeon *radeon_new(int fd, unsigned device)
break;
}
- radeon->mman = pb_malloc_bufmgr_create();
- if (!radeon->mman)
- return NULL;
radeon->kman = radeon_bo_pbmgr_create(radeon);
if (!radeon->kman)
return NULL;
@@ -182,7 +179,6 @@ struct radeon *radeon_decref(struct radeon *radeon)
return NULL;
}
- radeon->mman->destroy(radeon->mman);
radeon->cman->destroy(radeon->cman);
radeon->kman->destroy(radeon->kman);
drmClose(radeon->fd);
diff --git a/src/gallium/winsys/r600/drm/r600_priv.h b/src/gallium/winsys/r600/drm/r600_priv.h
index 285a192e74..07e734268d 100644
--- a/src/gallium/winsys/r600/drm/r600_priv.h
+++ b/src/gallium/winsys/r600/drm/r600_priv.h
@@ -41,7 +41,6 @@ struct radeon {
unsigned family;
enum chip_class chip_class;
boolean use_mem_constant; /* true for evergreen */
- struct pb_manager *mman; /* malloc manager */
struct pb_manager *kman; /* kernel bo manager */
struct pb_manager *cman; /* cached bo manager */
};