diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-03-02 09:22:44 +0100 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2010-03-04 09:38:37 -0800 |
| commit | d39d822cf887a861b37cee92c0b59533370ded2f (patch) | |
| tree | 38402d20bf904faedb3f68e845241e1f99fc659b /src | |
| parent | 65267d4bfbf19942beab72858333c6ee3c719223 (diff) | |
i830_memory: hide as much of the old memory allocator as possible
The only user left of this stuff is the xvmc support.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/i830.h | 6 | ||||
| -rw-r--r-- | src/i830_memory.c | 4 |
2 files changed, 2 insertions, 8 deletions
@@ -430,14 +430,8 @@ extern Bool i830_crtc_on(xf86CrtcPtr crtc); extern int i830_crtc_to_pipe(xf86CrtcPtr crtc); extern Bool I830AccelInit(ScreenPtr pScreen); -i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name, - unsigned long size, unsigned long pitch, - int flags, uint32_t tile_format); void i830_reset_allocations(ScrnInfoPtr scrn); -void i830_free_3d_memory(ScrnInfoPtr scrn); -void i830_free_memory(ScrnInfoPtr scrn, i830_memory * mem); Bool i830_allocate_2d_memory(ScrnInfoPtr scrn); -Bool i830_allocate_3d_memory(ScrnInfoPtr scrn); void i830_init_bufmgr(ScrnInfoPtr scrn); #ifdef INTEL_XVMC Bool i830_allocate_xvmc_buffer(ScrnInfoPtr scrn, const char *name, diff --git a/src/i830_memory.c b/src/i830_memory.c index 089667d1..c6003a5a 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -163,7 +163,7 @@ i830_check_display_stride(ScrnInfoPtr scrn, int stride, Bool tiling) return FALSE; } -void i830_free_memory(ScrnInfoPtr scrn, i830_memory * mem) +static void i830_free_memory(ScrnInfoPtr scrn, i830_memory * mem) { intel_screen_private *intel = intel_get_screen_private(scrn); @@ -228,7 +228,7 @@ void i830_reset_allocations(ScrnInfoPtr scrn) * the entire Screen lifetime. This means not using buffer objects, which * get their offsets chosen at each EnterVT time. */ -i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name, +static i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name, unsigned long size, unsigned long pitch, int flags, uint32_t tiling_mode) { |