summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2010-03-02 21:53:11 +0100
committerCarl Worth <cworth@cworth.org>2010-03-04 09:38:37 -0800
commit13266b152ae35ed54984844e3282cbdf20dc2e32 (patch)
treeb56863e7650f71832cfdf9e8d8498dba2f73676d
parentd39d822cf887a861b37cee92c0b59533370ded2f (diff)
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 <daniel.vetter@ffwll.ch> Reviewed-by: Carl Worth <cworth@cworth.org>
-rw-r--r--src/i965_hwmc.h12
1 files changed, 0 insertions, 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;