diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-02-22 14:40:25 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2015-03-05 14:20:31 -0700 |
| commit | 2f4d27285d0bf37a17b4851104f4f7aa9e4749b7 (patch) | |
| tree | 8532226689579db532467cfcbdd60ae17604533a | |
| parent | 11f80679380827743250df7d24addb776359b64f (diff) | |
| download | usermoji-2f4d27285d0bf37a17b4851104f4f7aa9e4749b7.tar.xz | |
nulldrv: remove icd-alloc.h dependency
| -rw-r--r-- | icd/nulldrv/nulldrv.c | 6 | ||||
| -rw-r--r-- | icd/nulldrv/nulldrv.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c index 8df3d8d2..24261678 100644 --- a/icd/nulldrv/nulldrv.c +++ b/icd/nulldrv/nulldrv.c @@ -108,7 +108,7 @@ static struct nulldrv_base *nulldrv_base_create(struct nulldrv_dev *dev, assert(obj_size >= sizeof(*base)); - base = (struct nulldrv_base*)icd_alloc(obj_size, 0, XGL_SYSTEM_ALLOC_API_OBJECT); + base = (struct nulldrv_base*)malloc(obj_size); if (!base) return NULL; @@ -136,7 +136,7 @@ static XGL_RESULT nulldrv_gpu_add(int devid, const char *primary_node, { struct nulldrv_gpu *gpu; - gpu = icd_alloc(sizeof(*gpu), 0, XGL_SYSTEM_ALLOC_API_OBJECT); + gpu = malloc(sizeof(*gpu)); if (!gpu) return XGL_ERROR_OUT_OF_MEMORY; memset(gpu, 0, sizeof(*gpu)); @@ -1519,7 +1519,7 @@ ICD_EXPORT XGL_RESULT XGLAPI xglCreateInstance( *pInstance = (XGL_INSTANCE*)inst; - return icd_allocator_init(pAllocCb); + return XGL_SUCCESS; } ICD_EXPORT XGL_RESULT XGLAPI xglDestroyInstance( diff --git a/icd/nulldrv/nulldrv.h b/icd/nulldrv/nulldrv.h index 70168c3b..ca22d4eb 100644 --- a/icd/nulldrv/nulldrv.h +++ b/icd/nulldrv/nulldrv.h @@ -41,7 +41,6 @@ #endif #include "icd.h" -#include "icd-alloc.h" #include "icd-format.h" #include "icd-utils.h" |