From 13266b152ae35ed54984844e3282cbdf20dc2e32 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 2 Mar 2010 21:53:11 +0100 Subject: XvMC: kill i830_memory in 965 class xvmc Yes, this breaks binary compat of the struct passed around between X ddx and the client libXvMC. But we always ship both, so they should not get out of sync. Signed-off-by: Daniel Vetter Reviewed-by: Carl Worth --- src/i965_hwmc.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/i965_hwmc.h b/src/i965_hwmc.h index 5bdd4525..194d07f9 100644 --- a/src/i965_hwmc.h +++ b/src/i965_hwmc.h @@ -1,14 +1,5 @@ #define I965_MC_STATIC_BUFFER_SIZE (1024*512) #define I965_MAX_SURFACES 12 -struct _i830_memory; -struct drm_memory_block { - struct _i830_memory *buffer; - drm_handle_t handle; - drmAddress ptr; - size_t size; - unsigned long offset; -}; - struct i965_xvmc_surface { int w, h; unsigned int no; @@ -18,9 +9,6 @@ struct i965_xvmc_surface { struct i965_xvmc_context { struct _intel_xvmc_common comm; - struct drm_memory_block static_buffer; - struct drm_memory_block blocks; - struct drm_memory_block slice; struct i965_xvmc_surface *surfaces[I965_MAX_SURFACES]; unsigned int is_g4x:1; unsigned int is_965_q:1; -- cgit v1.2.3