diff options
| author | Eric Anholt <eric@anholt.net> | 2008-09-05 10:35:32 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-09-10 14:07:18 -0700 |
| commit | 738e36acbce24df0ccadb499c5cf62ccb74f56df (patch) | |
| tree | 271da736d94c1ec99cdf7ae1428aa5d804ddce7c /libdrm/intel/intel_bufmgr_fake.c | |
| parent | 09cf0f0213652609d09154ce2859c03cf97ab11e (diff) | |
Move intel libdrm stuff to libdrm_intel.so
dri_bufmgr.h is replaced by intel_bufmgr.h, and several functions are renamed,
though the structures and many functions remain dri_bufmgr_* and dri_bo_*
Diffstat (limited to 'libdrm/intel/intel_bufmgr_fake.c')
| -rw-r--r-- | libdrm/intel/intel_bufmgr_fake.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libdrm/intel/intel_bufmgr_fake.c b/libdrm/intel/intel_bufmgr_fake.c index e2dd9dc7..8e581aed 100644 --- a/libdrm/intel/intel_bufmgr_fake.c +++ b/libdrm/intel/intel_bufmgr_fake.c @@ -37,8 +37,9 @@ #include <stdlib.h> #include <string.h> #include <assert.h> -#include "dri_bufmgr.h" +#include <xf86drm.h> #include "intel_bufmgr.h" +#include "intel_bufmgr_priv.h" #include "drm.h" #include "i915_drm.h" #include "mm.h" @@ -105,7 +106,6 @@ struct block { typedef struct _bufmgr_fake { dri_bufmgr bufmgr; - struct intel_bufmgr intel_bufmgr; unsigned long low_offset; unsigned long size; @@ -1216,12 +1216,12 @@ intel_bufmgr_fake_init(unsigned long low_offset, void *low_virtual, bufmgr_fake->bufmgr.bo_map = dri_fake_bo_map; bufmgr_fake->bufmgr.bo_unmap = dri_fake_bo_unmap; bufmgr_fake->bufmgr.bo_wait_rendering = dri_fake_bo_wait_rendering; + bufmgr_fake->bufmgr.bo_emit_reloc = dri_fake_emit_reloc; bufmgr_fake->bufmgr.destroy = dri_fake_destroy; bufmgr_fake->bufmgr.process_relocs = dri_fake_process_relocs; bufmgr_fake->bufmgr.post_submit = dri_fake_post_submit; bufmgr_fake->bufmgr.check_aperture_space = dri_fake_check_aperture_space; bufmgr_fake->bufmgr.debug = 0; - bufmgr_fake->intel_bufmgr.emit_reloc = dri_fake_emit_reloc; bufmgr_fake->fence_emit = fence_emit; bufmgr_fake->fence_wait = fence_wait; |