g3dvl: Move XvMC under the Xorg state tracker.

17 files changed, 0 insertions, 1981 deletions

diff --git a/src/xvmc/Makefile b/src/xvmc/Makefile
deleted file mode 100644
index e7636e65c60..00000000000
--- a/src/xvmc/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-TOP = ../..
-include $(TOP)/configs/current
-
-#DEFINES += -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\"
-
-SOURCES = block.c \
-          surface.c \
-          context.c \
-          subpicture.c \
-          attributes.c
-
-OBJECTS = $(SOURCES:.c=.o)
-
-INCLUDES = -I$(TOP)/src/gallium/include \
-           -I$(TOP)/src/gallium/auxiliary \
-           -I$(TOP)/src/gallium/winsys/g3dvl
-
-##### RULES #####
-
-.c.o:
-	$(CC) -c $(INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@
-
-.S.o:
-	$(CC) -c $(INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@
-
-##### TARGETS #####
-
-.PHONY: default clean
-
-default: depend libXvMCapi.a
-
-libXvMCapi.a: $(OBJECTS) Makefile
-	$(MKLIB) -o XvMCapi $(MKLIB_OPTIONS) -static $(OBJECTS)
-
-depend: $(SOURCES) Makefile
-	$(RM) depend
-	touch depend
-	$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDES) $(SOURCES)
-
-clean: Makefile
-	$(RM) libXvMCapi.a
-	$(RM) *.o *~
-	$(RM) depend depend.bak
-
--include depend
diff --git a/src/xvmc/SConscript b/src/xvmc/SConscript
deleted file mode 100644
index 53e04183e40..00000000000
--- a/src/xvmc/SConscript
+++ /dev/null
@@ -1,21 +0,0 @@
-Import('*')
-
-if env['platform'] not in ['linux']:
-    Return()
-
-env = env.Clone()
-
-env.AppendUnique(CPPPATH = [
-    '#/src/gallium/winsys/g3dvl',
-])
-
-XvMCapi = env.StaticLibrary(
-    target = 'XvMCapi',
-    source = [
-        'block.c',
-        'surface.c',
-        'context.c',
-        'subpicture.c',
-        'attributes.c',
-    ],
-)
diff --git a/src/xvmc/attributes.c b/src/xvmc/attributes.c
deleted file mode 100644
index 638da0b5775..00000000000
--- a/src/xvmc/attributes.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <assert.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/Xvlib.h>
-#include <X11/extensions/XvMClib.h>
-
-XvAttribute* XvMCQueryAttributes(Display *dpy, XvMCContext *context, int *number)
-{
-   return NULL;
-}
-
-Status XvMCSetAttribute(Display *dpy, XvMCContext *context, Atom attribute, int value)
-{
-   return BadImplementation;
-}
-
-Status XvMCGetAttribute(Display *dpy, XvMCContext *context, Atom attribute, int *value)
-{
-   return BadImplementation;
-}
diff --git a/src/xvmc/block.c b/src/xvmc/block.c
deleted file mode 100644
index 78fddfb79e0..00000000000
--- a/src/xvmc/block.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <assert.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/XvMClib.h>
-#include <util/u_memory.h>
-#include "xvmc_private.h"
-
-Status XvMCCreateBlocks(Display *dpy, XvMCContext *context, unsigned int num_blocks, XvMCBlockArray *blocks)
-{
-   assert(dpy);
-
-   if (!context)
-      return XvMCBadContext;
-   if (num_blocks == 0)
-      return BadValue;
-
-   assert(blocks);
-
-   blocks->context_id = context->context_id;
-   blocks->num_blocks = num_blocks;
-   blocks->blocks = MALLOC(BLOCK_SIZE_BYTES * num_blocks);
-   blocks->privData = NULL;
-
-   return Success;
-}
-
-Status XvMCDestroyBlocks(Display *dpy, XvMCBlockArray *blocks)
-{
-   assert(dpy);
-   assert(blocks);
-   FREE(blocks->blocks);
-
-   return Success;
-}
-
-Status XvMCCreateMacroBlocks(Display *dpy, XvMCContext *context, unsigned int num_blocks, XvMCMacroBlockArray *blocks)
-{
-   assert(dpy);
-
-   if (!context)
-      return XvMCBadContext;
-   if (num_blocks == 0)
-      return BadValue;
-
-   assert(blocks);
-
-   blocks->context_id = context->context_id;
-   blocks->num_blocks = num_blocks;
-   blocks->macro_blocks = MALLOC(sizeof(XvMCMacroBlock) * num_blocks);
-   blocks->privData = NULL;
-
-   return Success;
-}
-
-Status XvMCDestroyMacroBlocks(Display *dpy, XvMCMacroBlockArray *blocks)
-{
-   assert(dpy);
-   assert(blocks);
-   FREE(blocks->macro_blocks);
-
-   return Success;
-}
diff --git a/src/xvmc/context.c b/src/xvmc/context.c
deleted file mode 100644
index 33f47838f51..00000000000
--- a/src/xvmc/context.c
+++ /dev/null
@@ -1,203 +0,0 @@
-#include <assert.h>
-#include <X11/Xlibint.h>
-#include <X11/extensions/XvMClib.h>
-#include <pipe/p_screen.h>
-#include <pipe/p_video_context.h>
-#include <pipe/p_video_state.h>
-#include <pipe/p_state.h>
-#include <vl_winsys.h>
-#include <util/u_memory.h>
-#include "xvmc_private.h"
-
-static Status Validate(Display *dpy, XvPortID port, int surface_type_id,
-                       unsigned int width, unsigned int height, int flags,
-                       bool *found_port, int *screen, int *chroma_format, int *mc_type)
-{
-   bool found_surface = false;
-   XvAdaptorInfo *adaptor_info;
-   unsigned int num_adaptors;
-   int num_types;
-   unsigned int max_width, max_height;
-   Status ret;
-
-   assert(dpy);
-   assert(found_port);
-   assert(screen);
-   assert(chroma_format);
-   assert(mc_type);
-
-   *found_port = false;
-
-   for (unsigned int i = 0; i < XScreenCount(dpy); ++i)
-   {
-      ret = XvQueryAdaptors(dpy, XRootWindow(dpy, i), &num_adaptors, &adaptor_info);
-      if (ret != Success)
-         return ret;
-
-      for (unsigned int j = 0; j < num_adaptors && !*found_port; ++j)
-      {
-         for (unsigned int k = 0; k < adaptor_info[j].num_ports && !*found_port; ++k)
-         {
-            XvMCSurfaceInfo *surface_info;
-
-            if (adaptor_info[j].base_id + k != port)
-               continue;
-
-            *found_port = true;
-
-            surface_info = XvMCListSurfaceTypes(dpy, adaptor_info[j].base_id, &num_types);
-            if (!surface_info)
-            {
-               XvFreeAdaptorInfo(adaptor_info);
-               return BadAlloc;
-            }
-
-            for (unsigned int l = 0; l < num_types && !found_surface; ++l)
-            {
-               if (surface_info[l].surface_type_id != surface_type_id)
-                  continue;
-
-               found_surface = true;
-               max_width = surface_info[l].max_width;
-               max_height = surface_info[l].max_height;
-               *chroma_format = surface_info[l].chroma_format;
-               *mc_type = surface_info[l].mc_type;
-               *screen = i;
-            }
-
-         XFree(surface_info);
-         }
-      }
-
-      XvFreeAdaptorInfo(adaptor_info);
-   }
-
-   if (!*found_port)
-      return XvBadPort;
-   if (!found_surface)
-      return BadMatch;
-   if (width > max_width || height > max_height)
-      return BadValue;
-   if (flags != XVMC_DIRECT && flags != 0)
-      return BadValue;
-
-   return Success;
-}
-
-static enum pipe_video_profile ProfileToPipe(int xvmc_profile)
-{
-   if (xvmc_profile & XVMC_MPEG_1)
-      assert(0);
-   if (xvmc_profile & XVMC_MPEG_2)
-      return PIPE_VIDEO_PROFILE_MPEG2_MAIN;
-   if (xvmc_profile & XVMC_H263)
-      assert(0);
-   if (xvmc_profile & XVMC_MPEG_4)
-      assert(0);
-	
-   assert(0);
-
-   return -1;
-}
-
-static enum pipe_video_chroma_format FormatToPipe(int xvmc_format)
-{
-   switch (xvmc_format)
-   {
-      case XVMC_CHROMA_FORMAT_420:
-         return PIPE_VIDEO_CHROMA_FORMAT_420;
-      case XVMC_CHROMA_FORMAT_422:
-         return PIPE_VIDEO_CHROMA_FORMAT_422;
-      case XVMC_CHROMA_FORMAT_444:
-         return PIPE_VIDEO_CHROMA_FORMAT_444;
-      default:
-         assert(0);
-   }
-
-   return -1;
-}
-
-Status XvMCCreateContext(Display *dpy, XvPortID port, int surface_type_id,
-                         int width, int height, int flags, XvMCContext *context)
-{
-   bool found_port;
-   int scrn;
-   int chroma_format;
-   int mc_type;
-   Status ret;
-   struct pipe_screen *screen;
-   struct pipe_video_context *vpipe;
-   XvMCContextPrivate *context_priv;
-
-   assert(dpy);
-
-   if (!context)
-      return XvMCBadContext;
-
-   ret = Validate(dpy, port, surface_type_id, width, height, flags,
-                  &found_port, &scrn, &chroma_format, &mc_type);
-
-   /* Success and XvBadPort have the same value */
-   if (ret != Success || !found_port)
-      return ret;
-
-   context_priv = CALLOC(1, sizeof(XvMCContextPrivate));
-   if (!context_priv)
-      return BadAlloc;
-
-   /* TODO: Reuse screen if process creates another context */
-   screen = vl_screen_create(dpy, scrn);
-
-   if (!screen)
-   {
-      FREE(context_priv);
-      return BadAlloc;
-   }
-
-   vpipe = vl_video_create(screen, ProfileToPipe(mc_type),
-                           FormatToPipe(chroma_format), width, height);
-
-   if (!vpipe)
-   {
-      screen->destroy(screen);
-      FREE(context_priv);
-      return BadAlloc;
-   }
-
-   context_priv->vpipe = vpipe;
-
-   context->context_id = XAllocID(dpy);
-   context->surface_type_id = surface_type_id;
-   context->width = width;
-   context->height = height;
-   context->flags = flags;
-   context->port = port;
-   context->privData = context_priv;
-	
-   SyncHandle();
-
-   return Success;
-}
-
-Status XvMCDestroyContext(Display *dpy, XvMCContext *context)
-{
-   struct pipe_screen *screen;
-   struct pipe_video_context *vpipe;
-   XvMCContextPrivate *context_priv;
-
-   assert(dpy);
-
-   if (!context || !context->privData)
-      return XvMCBadContext;
-
-   context_priv = context->privData;
-   vpipe = context_priv->vpipe;
-   pipe_surface_reference(&context_priv->backbuffer, NULL);
-   screen = vpipe->screen;
-   vpipe->destroy(vpipe);
-   screen->destroy(screen);
-   FREE(context_priv);
-   context->privData = NULL;
-
-   return Success;
-}
diff --git a/src/xvmc/subpicture.c b/src/xvmc/subpicture.c
deleted file mode 100644
index 78ba618f5ab..00000000000
--- a/src/xvmc/subpicture.c
+++ /dev/null
@@ -1,168 +0,0 @@
-#include <assert.h>
-#include <X11/Xlibint.h>
-#include <X11/extensions/XvMClib.h>
-
-Status XvMCCreateSubpicture(Display *dpy, XvMCContext *context, XvMCSubpicture *subpicture,
-                            unsigned short width, unsigned short height, int xvimage_id)
-{
-   assert(dpy);
-
-   if (!context)
-      return XvMCBadContext;
-
-   assert(subpicture);
-
-   /*if (width > || height > )
-      return BadValue;*/
-
-   /*if (xvimage_id != )
-      return BadMatch;*/
-
-   subpicture->subpicture_id = XAllocID(dpy);
-   subpicture->context_id = context->context_id;
-   subpicture->xvimage_id = xvimage_id;
-   subpicture->width = width;
-   subpicture->height = height;
-   subpicture->num_palette_entries = 0;
-   subpicture->entry_bytes = 0;
-   subpicture->component_order[0] = 0;
-   subpicture->component_order[1] = 0;
-   subpicture->component_order[2] = 0;
-   subpicture->component_order[3] = 0;
-   /* TODO: subpicture->privData = ;*/
-
-   SyncHandle();
-
-   return Success;
-}
-
-Status XvMCClearSubpicture(Display *dpy, XvMCSubpicture *subpicture, short x, short y,
-                           unsigned short width, unsigned short height, unsigned int color)
-{
-   assert(dpy);
-
-   if (!subpicture)
-      return XvMCBadSubpicture;
-
-   /* TODO: Assert clear rect is within bounds? Or clip? */
-
-   return Success;
-}
-
-Status XvMCCompositeSubpicture(Display *dpy, XvMCSubpicture *subpicture, XvImage *image,
-                               short srcx, short srcy, unsigned short width, unsigned short height,
-                               short dstx, short dsty)
-{
-   assert(dpy);
-
-   if (!subpicture)
-      return XvMCBadSubpicture;
-
-   assert(image);
-
-   if (subpicture->xvimage_id != image->id)
-      return BadMatch;
-
-   /* TODO: Assert rects are within bounds? Or clip? */
-
-   return Success;
-}
-
-Status XvMCDestroySubpicture(Display *dpy, XvMCSubpicture *subpicture)
-{
-   assert(dpy);
-
-   if (!subpicture)
-      return XvMCBadSubpicture;
-
-   return BadImplementation;
-}
-
-Status XvMCSetSubpicturePalette(Display *dpy, XvMCSubpicture *subpicture, unsigned char *palette)
-{
-   assert(dpy);
-
-   if (!subpicture)
-      return XvMCBadSubpicture;
-
-   assert(palette);
-
-   /* We don't support paletted subpictures */
-   return BadMatch;
-}
-
-Status XvMCBlendSubpicture(Display *dpy, XvMCSurface *target_surface, XvMCSubpicture *subpicture,
-                           short subx, short suby, unsigned short subw, unsigned short subh,
-                           short surfx, short surfy, unsigned short surfw, unsigned short surfh)
-{
-   assert(dpy);
-
-   if (!target_surface)
-      return XvMCBadSurface;
-
-   if (!subpicture)
-      return XvMCBadSubpicture;
-
-   if (target_surface->context_id != subpicture->context_id)
-      return BadMatch;
-
-   /* TODO: Assert rects are within bounds? Or clip? */
-   return Success;
-}
-
-Status XvMCBlendSubpicture2(Display *dpy, XvMCSurface *source_surface, XvMCSurface *target_surface,
-                            XvMCSubpicture *subpicture, short subx, short suby, unsigned short subw, unsigned short subh,
-                            short surfx, short surfy, unsigned short surfw, unsigned short surfh)
-{
-   assert(dpy);
-
-   if (!source_surface || !target_surface)
-      return XvMCBadSurface;
-
-   if (!subpicture)
-      return XvMCBadSubpicture;
-
-   if (source_surface->context_id != subpicture->context_id)
-      return BadMatch;
-
-   if (source_surface->context_id != subpicture->context_id)
-      return BadMatch;
-
-   /* TODO: Assert rects are within bounds? Or clip? */
-   return Success;
-}
-
-Status XvMCSyncSubpicture(Display *dpy, XvMCSubpicture *subpicture)
-{
-   assert(dpy);
-
-   if (!subpicture)
-      return XvMCBadSubpicture;
-
-   return Success;
-}
-
-Status XvMCFlushSubpicture(Display *dpy, XvMCSubpicture *subpicture)
-{
-   assert(dpy);
-
-   if (!subpicture)
-      return XvMCBadSubpicture;
-
-   return Success;
-}
-
-Status XvMCGetSubpictureStatus(Display *dpy, XvMCSubpicture *subpicture, int *status)
-{
-   assert(dpy);
-
-   if (!subpicture)
-      return XvMCBadSubpicture;
-
-   assert(status);
-
-   /* TODO */
-   *status = 0;
-
-   return Success;
-}
diff --git a/src/xvmc/surface.c b/src/xvmc/surface.c
deleted file mode 100644
index 0467c4d07d9..00000000000
--- a/src/xvmc/surface.c
+++ /dev/null
@@ -1,429 +0,0 @@
-#include <assert.h>
-#include <X11/Xlibint.h>
-#include <pipe/p_video_context.h>
-#include <pipe/p_video_state.h>
-#include <pipe/p_state.h>
-#include <util/u_memory.h>
-#include "xvmc_private.h"
-
-static enum pipe_mpeg12_macroblock_type TypeToPipe(int xvmc_mb_type)
-{
-   if (xvmc_mb_type & XVMC_MB_TYPE_INTRA)
-      return PIPE_MPEG12_MACROBLOCK_TYPE_INTRA;
-   if ((xvmc_mb_type & (XVMC_MB_TYPE_MOTION_FORWARD | XVMC_MB_TYPE_MOTION_BACKWARD)) == XVMC_MB_TYPE_MOTION_FORWARD)
-      return PIPE_MPEG12_MACROBLOCK_TYPE_FWD;
-   if ((xvmc_mb_type & (XVMC_MB_TYPE_MOTION_FORWARD | XVMC_MB_TYPE_MOTION_BACKWARD)) == XVMC_MB_TYPE_MOTION_BACKWARD)
-      return PIPE_MPEG12_MACROBLOCK_TYPE_BKWD;
-   if ((xvmc_mb_type & (XVMC_MB_TYPE_MOTION_FORWARD | XVMC_MB_TYPE_MOTION_BACKWARD)) == (XVMC_MB_TYPE_MOTION_FORWARD | XVMC_MB_TYPE_MOTION_BACKWARD))
-      return PIPE_MPEG12_MACROBLOCK_TYPE_BI;
-
-   assert(0);
-
-   return -1;
-}
-
-static enum pipe_mpeg12_picture_type PictureToPipe(int xvmc_pic)
-{
-   switch (xvmc_pic)
-   {
-      case XVMC_TOP_FIELD:
-         return PIPE_MPEG12_PICTURE_TYPE_FIELD_TOP;
-      case XVMC_BOTTOM_FIELD:
-         return PIPE_MPEG12_PICTURE_TYPE_FIELD_BOTTOM;
-      case XVMC_FRAME_PICTURE:
-         return PIPE_MPEG12_PICTURE_TYPE_FRAME;
-      default:
-         assert(0);
-   }
-
-   return -1;
-}
-
-static enum pipe_mpeg12_motion_type MotionToPipe(int xvmc_motion_type, int xvmc_dct_type)
-{
-   switch (xvmc_motion_type)
-   {
-      case XVMC_PREDICTION_FRAME:
-         return xvmc_dct_type == XVMC_DCT_TYPE_FIELD ?
-            PIPE_MPEG12_MOTION_TYPE_16x8 : PIPE_MPEG12_MOTION_TYPE_FRAME;
-      case XVMC_PREDICTION_FIELD:
-         return PIPE_MPEG12_MOTION_TYPE_FIELD;
-      case XVMC_PREDICTION_DUAL_PRIME:
-         return PIPE_MPEG12_MOTION_TYPE_DUALPRIME;
-      default:
-         assert(0);
-   }
-
-   return -1;
-}
-
-static bool
-CreateOrResizeBackBuffer(struct pipe_video_context *vpipe, unsigned int width, unsigned int height,
-                         struct pipe_surface **backbuffer)
-{
-   struct pipe_texture template;
-   struct pipe_texture *tex;
-
-   assert(vpipe);
-
-   if (*backbuffer)
-   {
-      if ((*backbuffer)->width != width || (*backbuffer)->height != height)
-         pipe_surface_reference(backbuffer, NULL);
-      else
-         return true;
-   }
-
-   memset(&template, 0, sizeof(struct pipe_texture));
-   template.target = PIPE_TEXTURE_2D;
-   /* XXX: Needs to match the drawable's format? */
-   template.format = PIPE_FORMAT_X8R8G8B8_UNORM;
-   template.last_level = 0;
-   template.width[0] = width;
-   template.height[0] = height;
-   template.depth[0] = 1;
-   pf_get_block(template.format, &template.block);
-   template.tex_usage = PIPE_TEXTURE_USAGE_DISPLAY_TARGET;
-
-   tex = vpipe->screen->texture_create(vpipe->screen, &template);
-   if (!tex)
-      return false;
-
-   *backbuffer = vpipe->screen->get_tex_surface(vpipe->screen, tex, 0, 0, 0,
-                                                PIPE_BUFFER_USAGE_GPU_READ |
-                                                PIPE_BUFFER_USAGE_GPU_WRITE);
-   pipe_texture_reference(&tex, NULL);
-
-   if (!*backbuffer)
-      return false;
-
-   /* Clear the backbuffer in case the video doesn't cover the whole window */
-   /* FIXME: Need to clear every time a frame moves and leaves dirty rects */
-   vpipe->clear_surface(vpipe, 0, 0, width, height, 0, *backbuffer);
-
-   return true;
-}
-
-static void
-MacroBlocksToPipe(const XvMCMacroBlockArray *xvmc_macroblocks,
-                  const XvMCBlockArray *xvmc_blocks,
-                  unsigned int first_macroblock,
-                  unsigned int num_macroblocks,
-                  struct pipe_mpeg12_macroblock *pipe_macroblocks)
-{
-   unsigned int i, j, k, l;
-   XvMCMacroBlock *xvmc_mb;
-
-   assert(xvmc_macroblocks);
-   assert(xvmc_blocks);
-   assert(pipe_macroblocks);
-   assert(num_macroblocks);
-
-   xvmc_mb = xvmc_macroblocks->macro_blocks + first_macroblock;
-
-   for (i = 0; i < num_macroblocks; ++i)
-   {
-      pipe_macroblocks->base.codec = PIPE_VIDEO_CODEC_MPEG12;
-      pipe_macroblocks->mbx = xvmc_mb->x;
-      pipe_macroblocks->mby = xvmc_mb->y;
-      pipe_macroblocks->mb_type = TypeToPipe(xvmc_mb->macroblock_type);
-      if (pipe_macroblocks->mb_type != PIPE_MPEG12_MACROBLOCK_TYPE_INTRA)
-         pipe_macroblocks->mo_type = MotionToPipe(xvmc_mb->motion_type, xvmc_mb->dct_type);
-      /* Get rid of Valgrind 'undefined' warnings */
-      else
-         pipe_macroblocks->mo_type = -1;
-      pipe_macroblocks->dct_type = xvmc_mb->dct_type == XVMC_DCT_TYPE_FIELD ?
-         PIPE_MPEG12_DCT_TYPE_FIELD : PIPE_MPEG12_DCT_TYPE_FRAME;
-
-      for (j = 0; j < 2; ++j)
-         for (k = 0; k < 2; ++k)
-            for (l = 0; l < 2; ++l)
-               pipe_macroblocks->pmv[j][k][l] = xvmc_mb->PMV[j][k][l];
-
-      pipe_macroblocks->cbp = xvmc_mb->coded_block_pattern;
-      pipe_macroblocks->blocks = xvmc_blocks->blocks + xvmc_mb->index * BLOCK_SIZE_SAMPLES;
-
-      ++pipe_macroblocks;
-      ++xvmc_mb;
-   }
-}
-
-Status XvMCCreateSurface(Display *dpy, XvMCContext *context, XvMCSurface *surface)
-{
-   XvMCContextPrivate *context_priv;
-   struct pipe_video_context *vpipe;
-   XvMCSurfacePrivate *surface_priv;
-   struct pipe_video_surface *vsfc;
-
-   assert(dpy);
-
-   if (!context)
-      return XvMCBadContext;
-   if (!surface)
-      return XvMCBadSurface;
-
-   context_priv = context->privData;
-   vpipe = context_priv->vpipe;
-
-   surface_priv = CALLOC(1, sizeof(XvMCSurfacePrivate));
-   if (!surface_priv)
-      return BadAlloc;
-
-   vsfc = vpipe->screen->video_surface_create(vpipe->screen, vpipe->chroma_format,
-                                              vpipe->width, vpipe->height);
-   if (!vsfc)
-   {
-      FREE(surface_priv);
-      return BadAlloc;
-   }
-
-   surface_priv->pipe_vsfc = vsfc;
-   surface_priv->context = context;
-
-   surface->surface_id = XAllocID(dpy);
-   surface->context_id = context->context_id;
-   surface->surface_type_id = context->surface_type_id;
-   surface->width = context->width;
-   surface->height = context->height;
-   surface->privData = surface_priv;
-
-   SyncHandle();
-
-   return Success;
-}
-
-Status XvMCRenderSurface(Display *dpy, XvMCContext *context, unsigned int picture_structure,
-                         XvMCSurface *target_surface, XvMCSurface *past_surface, XvMCSurface *future_surface,
-                         unsigned int flags, unsigned int num_macroblocks, unsigned int first_macroblock,
-                         XvMCMacroBlockArray *macroblocks, XvMCBlockArray *blocks
-)
-{
-   struct pipe_video_context *vpipe;
-   struct pipe_surface *t_vsfc;
-   struct pipe_surface *p_vsfc;
-   struct pipe_surface *f_vsfc;
-   XvMCContextPrivate *context_priv;
-   XvMCSurfacePrivate *target_surface_priv;
-   XvMCSurfacePrivate *past_surface_priv;
-   XvMCSurfacePrivate *future_surface_priv;
-   struct pipe_mpeg12_macroblock pipe_macroblocks[num_macroblocks];
-
-   assert(dpy);
-
-   if (!context || !context->privData)
-      return XvMCBadContext;
-   if (!target_surface || !target_surface->privData)
-      return XvMCBadSurface;
-
-   if (picture_structure != XVMC_TOP_FIELD &&
-       picture_structure != XVMC_BOTTOM_FIELD &&
-       picture_structure != XVMC_FRAME_PICTURE)
-      return BadValue;
-   /* Bkwd pred equivalent to fwd (past && !future) */
-   if (future_surface && !past_surface)
-      return BadMatch;
-
-   assert(context->context_id == target_surface->context_id);
-   assert(!past_surface || context->context_id == past_surface->context_id);
-   assert(!future_surface || context->context_id == future_surface->context_id);
-
-   assert(macroblocks);
-   assert(blocks);
-
-   assert(macroblocks->context_id == context->context_id);
-   assert(blocks->context_id == context->context_id);
-
-   assert(flags == 0 || flags == XVMC_SECOND_FIELD);
-
-   target_surface_priv = target_surface->privData;
-   past_surface_priv = past_surface ? past_surface->privData : NULL;
-   future_surface_priv = future_surface ? future_surface->privData : NULL;
-
-   assert(target_surface_priv->context == context);
-   assert(!past_surface || past_surface_priv->context == context);
-   assert(!future_surface || future_surface_priv->context == context);
-
-   context_priv = context->privData;
-   vpipe = context_priv->vpipe;
-
-   t_vsfc = target_surface_priv->pipe_vsfc;
-   p_vsfc = past_surface ? past_surface_priv->pipe_vsfc : NULL;
-   f_vsfc = future_surface ? future_surface_priv->pipe_vsfc : NULL;
-
-   MacroBlocksToPipe(macroblocks, blocks, first_macroblock,
-                     num_macroblocks, pipe_macroblocks);
-
-   vpipe->set_decode_target(vpipe, t_vsfc);
-   vpipe->decode_macroblocks(vpipe, p_vsfc, f_vsfc, num_macroblocks,
-                             &pipe_macroblocks->base, target_surface_priv->render_fence);
-
-   return Success;
-}
-
-Status XvMCFlushSurface(Display *dpy, XvMCSurface *surface)
-{
-#if 0
-	struct vlSurface *vl_sfc;
-
-	assert(dpy);
-
-	if (!surface)
-		return XvMCBadSurface;
-
-	vl_sfc = surface->privData;
-
-	vlSurfaceFlush(vl_sfc);
-#endif
-   return Success;
-}
-
-Status XvMCSyncSurface(Display *dpy, XvMCSurface *surface)
-{
-#if 0
-	struct vlSurface *vl_sfc;
-
-	assert(dpy);
-
-	if (!surface)
-		return XvMCBadSurface;
-
-	vl_sfc = surface->privData;
-
-	vlSurfaceSync(vl_sfc);
-#endif
-   return Success;
-}
-
-Status XvMCPutSurface(Display *dpy, XvMCSurface *surface, Drawable drawable,
-                      short srcx, short srcy, unsigned short srcw, unsigned short srch,
-                      short destx, short desty, unsigned short destw, unsigned short desth,
-                      int flags)
-{
-   Window root;
-   int x, y;
-   unsigned int width, height;
-   unsigned int border_width;
-   unsigned int depth;
-   struct pipe_video_context *vpipe;
-   XvMCSurfacePrivate *surface_priv;
-   XvMCContextPrivate *context_priv;
-   XvMCContext *context;
-   struct pipe_video_rect src_rect = {srcx, srcy, srcw, srch};
-   struct pipe_video_rect dst_rect = {destx, desty, destw, desth};
-
-   assert(dpy);
-
-   if (!surface || !surface->privData)
-      return XvMCBadSurface;
-
-   if (XGetGeometry(dpy, drawable, &root, &x, &y, &width, &height, &border_width, &depth) == BadDrawable)
-      return BadDrawable;
-
-   assert(flags == XVMC_TOP_FIELD || flags == XVMC_BOTTOM_FIELD || flags == XVMC_FRAME_PICTURE);
-   assert(srcx + srcw - 1 < surface->width);
-   assert(srcy + srch - 1 < surface->height);
-   /*
-    * Some apps (mplayer) hit these asserts because they call
-    * this function after the window has been resized by the WM
-    * but before they've handled the corresponding XEvent and
-    * know about the new dimensions. The output should be clipped
-    * until the app updates destw and desth.
-    */
-   /*
-   assert(destx + destw - 1 < width);
-   assert(desty + desth - 1 < height);
-    */
-
-   surface_priv = surface->privData;
-   context = surface_priv->context;
-   context_priv = context->privData;
-   vpipe = context_priv->vpipe;
-
-   if (!CreateOrResizeBackBuffer(vpipe, width, height, &context_priv->backbuffer))
-      return BadAlloc;
-
-   vpipe->render_picture(vpipe, surface_priv->pipe_vsfc, PictureToPipe(flags), &src_rect,
-                         context_priv->backbuffer, &dst_rect, surface_priv->disp_fence);
-
-   vl_video_bind_drawable(vpipe, drawable);
-	
-   vpipe->screen->flush_frontbuffer
-   (
-      vpipe->screen,
-      context_priv->backbuffer,
-      vpipe->priv
-   );
-
-   return Success;
-}
-
-Status XvMCGetSurfaceStatus(Display *dpy, XvMCSurface *surface, int *status)
-{
-#if 0
-	struct vlSurface	*vl_sfc;
-	enum vlResourceStatus	res_status;
-
-	assert(dpy);
-
-	if (!surface)
-		return XvMCBadSurface;
-
-	assert(status);
-
-	vl_sfc = surface->privData;
-
-	vlSurfaceGetStatus(vl_sfc, &res_status);
-
-	switch (res_status)
-	{
-		case vlResourceStatusFree:
-		{
-			*status = 0;
-			break;
-		}
-		case vlResourceStatusRendering:
-		{
-			*status = XVMC_RENDERING;
-			break;
-		}
-		case vlResourceStatusDisplaying:
-		{
-			*status = XVMC_DISPLAYING;
-			break;
-		}
-		default:
-			assert(0);
-	}
-#endif
-   *status = 0;
-   return Success;
-}
-
-Status XvMCDestroySurface(Display *dpy, XvMCSurface *surface)
-{
-   XvMCSurfacePrivate *surface_priv;
-
-   assert(dpy);
-
-   if (!surface || !surface->privData)
-      return XvMCBadSurface;
-
-   surface_priv = surface->privData;
-   pipe_video_surface_reference(&surface_priv->pipe_vsfc, NULL);
-   FREE(surface_priv);
-   surface->privData = NULL;
-
-   return Success;
-}
-
-Status XvMCHideSurface(Display *dpy, XvMCSurface *surface)
-{
-   assert(dpy);
-
-   if (!surface || !surface->privData)
-      return XvMCBadSurface;
-
-   /* No op, only for overlaid rendering */
-
-   return Success;
-}
diff --git a/src/xvmc/tests/.gitignore b/src/xvmc/tests/.gitignore
deleted file mode 100644
index e1d2f9023df..00000000000
--- a/src/xvmc/tests/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-test_context
-test_surface
-test_blocks
-test_rendering
-xvmc_bench
diff --git a/src/xvmc/tests/Makefile b/src/xvmc/tests/Makefile
deleted file mode 100644
index 11b2e1a812b..00000000000
--- a/src/xvmc/tests/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-TOP = ../../..
-include $(TOP)/configs/current
-
-LIBS = -lXvMCW -lXvMC -lXv -lX11
-
-#############################################
-
-.PHONY: default clean
-
-default: test_context test_surface test_blocks test_rendering xvmc_bench
-
-test_context: test_context.o testlib.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
-test_surface: test_surface.o testlib.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
-test_blocks: test_blocks.o testlib.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
-test_rendering: test_rendering.o testlib.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
-xvmc_bench: xvmc_bench.o testlib.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
-clean:
-	$(RM) -rf *.o test_context test_surface test_blocks test_rendering xvmc_bench
diff --git a/src/xvmc/tests/test_blocks.c b/src/xvmc/tests/test_blocks.c
deleted file mode 100644
index dc80adfa652..00000000000
--- a/src/xvmc/tests/test_blocks.c
+++ /dev/null
@@ -1,84 +0,0 @@
-#include <assert.h>
-#include <error.h>
-#include "testlib.h"
-
-int main(int argc, char **argv)
-{
-	const unsigned int	width = 16, height = 16;
-	const unsigned int	min_required_blocks = 1, min_required_macroblocks = 1;
-	const unsigned int	mc_types[2] = {XVMC_MOCOMP | XVMC_MPEG_2, XVMC_IDCT | XVMC_MPEG_2};
-
-	Display			*display;
-	XvPortID		port_num;
-	int			surface_type_id;
-	unsigned int		is_overlay, intra_unsigned;
-	int			colorkey;
-	XvMCContext		context;
-	XvMCSurface		surface;
-	XvMCBlockArray		blocks = {0};
-	XvMCMacroBlockArray	macroblocks = {0};
-
-	display = XOpenDisplay(NULL);
-
-	if (!GetPort
-	(
-		display,
-		width,
-		height,
-		XVMC_CHROMA_FORMAT_420,
-    		mc_types,
-    		2,
-    		&port_num,
-    		&surface_type_id,
-    		&is_overlay,
-    		&intra_unsigned
-	))
-	{
-		XCloseDisplay(display);
-		error(1, 0, "Error, unable to find a good port.\n");
-	}
-
-	if (is_overlay)
-	{
-		Atom xv_colorkey = XInternAtom(display, "XV_COLORKEY", 0);
-		XvGetPortAttribute(display, port_num, xv_colorkey, &colorkey);
-	}
-
-	assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, XVMC_DIRECT, &context) == Success);
-	assert(XvMCCreateSurface(display, &context, &surface) == Success);
-
-	/* Test NULL context */
-	assert(XvMCCreateBlocks(display, NULL, 1, &blocks) == XvMCBadContext);
-	/* Test 0 blocks */
-	assert(XvMCCreateBlocks(display, &context, 0, &blocks) == BadValue);
-	/* Test valid params */
-	assert(XvMCCreateBlocks(display, &context, min_required_blocks, &blocks) == Success);
-	/* Test context id assigned and correct */
-	assert(blocks.context_id == context.context_id);
-	/* Test number of blocks assigned and correct */
-	assert(blocks.num_blocks == min_required_blocks);
-	/* Test block pointer valid */
-	assert(blocks.blocks != NULL);
-	/* Test NULL context */
-	assert(XvMCCreateMacroBlocks(display, NULL, 1, &macroblocks) == XvMCBadContext);
-	/* Test 0 macroblocks */
-	assert(XvMCCreateMacroBlocks(display, &context, 0, &macroblocks) == BadValue);
-	/* Test valid params */
-	assert(XvMCCreateMacroBlocks(display, &context, min_required_macroblocks, &macroblocks) == Success);
-	/* Test context id assigned and correct */
-	assert(macroblocks.context_id == context.context_id);
-	/* Test macroblock pointer valid */
-	assert(macroblocks.macro_blocks != NULL);
-	/* Test valid params */
-	assert(XvMCDestroyMacroBlocks(display, &macroblocks) == Success);
-	/* Test valid params */
-	assert(XvMCDestroyBlocks(display, &blocks) == Success);
-
-	assert(XvMCDestroySurface(display, &surface) == Success);
-	assert(XvMCDestroyContext(display, &context) == Success);
-
-	XvUngrabPort(display, port_num, CurrentTime);
-	XCloseDisplay(display);
-
-	return 0;
-}
diff --git a/src/xvmc/tests/test_context.c b/src/xvmc/tests/test_context.c
deleted file mode 100644
index 53f7449cd0b..00000000000
--- a/src/xvmc/tests/test_context.c
+++ /dev/null
@@ -1,92 +0,0 @@
-#include <assert.h>
-#include <error.h>
-#include "testlib.h"
-
-int main(int argc, char **argv)
-{
-	const unsigned int	width = 16, height = 16;
-	const unsigned int	mc_types[2] = {XVMC_MOCOMP | XVMC_MPEG_2, XVMC_IDCT | XVMC_MPEG_2};
-
-	Display			*display;
-	XvPortID		port_num;
-	int			surface_type_id;
-	unsigned int		is_overlay, intra_unsigned;
-	int			colorkey;
-	XvMCContext		context = {0};
-
-	display = XOpenDisplay(NULL);
-
-	if (!GetPort
-	(
-		display,
-		width,
-		height,
-		XVMC_CHROMA_FORMAT_420,
-    		mc_types,
-    		2,
-    		&port_num,
-    		&surface_type_id,
-    		&is_overlay,
-    		&intra_unsigned
-	))
-	{
-		XCloseDisplay(display);
-		error(1, 0, "Error, unable to find a good port.\n");
-	}
-
-	if (is_overlay)
-	{
-		Atom xv_colorkey = XInternAtom(display, "XV_COLORKEY", 0);
-		XvGetPortAttribute(display, port_num, xv_colorkey, &colorkey);
-	}
-
-	/* Test NULL context */
-	/* XXX: XvMCBadContext not a valid return for XvMCCreateContext in the XvMC API, but openChrome driver returns it */
-	assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, XVMC_DIRECT, NULL) == XvMCBadContext);
-	/* Test invalid port */
-	/* XXX: Success and XvBadPort have the same value, if this call actually gets passed the validation step as of now we'll crash later */
-	assert(XvMCCreateContext(display, -1, surface_type_id, width, height, XVMC_DIRECT, &context) == XvBadPort);
-	/* Test invalid surface */
-	assert(XvMCCreateContext(display, port_num, -1, width, height, XVMC_DIRECT, &context) == BadMatch);
-	/* Test invalid flags */
-	assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, -1, &context) == BadValue);
-	/* Test huge width */
-	assert(XvMCCreateContext(display, port_num, surface_type_id, 16384, height, XVMC_DIRECT, &context) == BadValue);
-	/* Test huge height */
-	assert(XvMCCreateContext(display, port_num, surface_type_id, width, 16384, XVMC_DIRECT, &context) == BadValue);
-	/* Test huge width & height */
-	assert(XvMCCreateContext(display, port_num, surface_type_id, 16384, 16384, XVMC_DIRECT, &context) == BadValue);
-	/* Test valid params */
-	assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, XVMC_DIRECT, &context) == Success);
-	/* Test context id assigned */
-	assert(context.context_id != 0);
-	/* Test surface type id assigned and correct */
-	assert(context.surface_type_id == surface_type_id);
-	/* Test width & height assigned and correct */
-	assert(context.width == width && context.height == height);
-	/* Test port assigned and correct */
-	assert(context.port == port_num);
-	/* Test flags assigned and correct */
-	assert(context.flags == XVMC_DIRECT);
-	/* Test NULL context */
-	assert(XvMCDestroyContext(display, NULL) == XvMCBadContext);
-	/* Test valid params */
-	assert(XvMCDestroyContext(display, &context) == Success);
-	/* Test awkward but valid width */
-	assert(XvMCCreateContext(display, port_num, surface_type_id, width + 1, height, XVMC_DIRECT, &context) == Success);
-	assert(context.width >= width + 1);
-	assert(XvMCDestroyContext(display, &context) == Success);
-	/* Test awkward but valid height */
-	assert(XvMCCreateContext(display, port_num, surface_type_id, width, height + 1, XVMC_DIRECT, &context) == Success);
-	assert(context.height >= height + 1);
-	assert(XvMCDestroyContext(display, &context) == Success);
-	/* Test awkward but valid width & height */
-	assert(XvMCCreateContext(display, port_num, surface_type_id, width + 1, height + 1, XVMC_DIRECT, &context) == Success);
-	assert(context.width >= width + 1 && context.height >= height + 1);
-	assert(XvMCDestroyContext(display, &context) == Success);
-
-	XvUngrabPort(display, port_num, CurrentTime);
-	XCloseDisplay(display);
-
-	return 0;
-}
diff --git a/src/xvmc/tests/test_rendering.c b/src/xvmc/tests/test_rendering.c
deleted file mode 100644
index 6d720dfcdca..00000000000
--- a/src/xvmc/tests/test_rendering.c
+++ /dev/null
@@ -1,290 +0,0 @@
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <error.h>
-#include "testlib.h"
-
-#define BLOCK_WIDTH			8
-#define BLOCK_HEIGHT			8
-#define BLOCK_SIZE			(BLOCK_WIDTH * BLOCK_HEIGHT)
-#define MACROBLOCK_WIDTH		16
-#define MACROBLOCK_HEIGHT		16
-#define MACROBLOCK_WIDTH_IN_BLOCKS	(MACROBLOCK_WIDTH / BLOCK_WIDTH)
-#define MACROBLOCK_HEIGHT_IN_BLOCKS	(MACROBLOCK_HEIGHT / BLOCK_HEIGHT)
-#define BLOCKS_PER_MACROBLOCK		6
-
-#define INPUT_WIDTH			16
-#define INPUT_HEIGHT			16
-#define INPUT_WIDTH_IN_MACROBLOCKS	(INPUT_WIDTH / MACROBLOCK_WIDTH)
-#define INPUT_HEIGHT_IN_MACROBLOCKS	(INPUT_HEIGHT / MACROBLOCK_HEIGHT)
-#define NUM_MACROBLOCKS			(INPUT_WIDTH_IN_MACROBLOCKS * INPUT_HEIGHT_IN_MACROBLOCKS)
-
-#define DEFAULT_OUTPUT_WIDTH		INPUT_WIDTH
-#define DEFAULT_OUTPUT_HEIGHT		INPUT_HEIGHT
-#define DEFAULT_ACCEPTABLE_ERR		0.01
-
-void ParseArgs(int argc, char **argv, unsigned int *output_width, unsigned int *output_height, double *acceptable_error, int *prompt);
-void Gradient(short *block, unsigned int start, unsigned int stop, int horizontal);
-
-void ParseArgs(int argc, char **argv, unsigned int *output_width, unsigned int *output_height, double *acceptable_error, int *prompt)
-{
-	int fail = 0;
-	int i;
-
-	*output_width = DEFAULT_OUTPUT_WIDTH;
-	*output_height = DEFAULT_OUTPUT_WIDTH;
-	*acceptable_error = DEFAULT_ACCEPTABLE_ERR;
-	*prompt = 1;
-
-	for (i = 1; i < argc && !fail; ++i)
-	{
-		if (!strcmp(argv[i], "-w"))
-		{
-			if (sscanf(argv[++i], "%u", output_width) != 1)
-				fail = 1;
-		}
-		else if (!strcmp(argv[i], "-h"))
-		{
-			if (sscanf(argv[++i], "%u", output_height) != 1)
-				fail = 1;
-		}
-		else if (!strcmp(argv[i], "-e"))
-		{
-			if (sscanf(argv[++i], "%lf", acceptable_error) != 1)
-				fail = 1;
-		}
-		else if (strcmp(argv[i], "-n"))
-			*prompt = 0;
-		else
-			fail = 1;
-	}
-
-	if (fail)
-		error
-		(
-			1, 0,
-			"Bad argument.\n"
-			"\n"
-			"Usage: %s [options]\n"
-			"\t-w <width>\tOutput width\n"
-			"\t-h <height>\tOutput height\n"
-			"\t-e <error>\tAcceptable margin of error per pixel, from 0 to 1\n"
-			"\t-n\tDon't prompt for quit\n",
-			argv[0]
-		);
-}
-
-void Gradient(short *block, unsigned int start, unsigned int stop, int horizontal)
-{
-	unsigned int x, y;
-	unsigned int range = stop - start;
-
-	if (horizontal)
-	{
-		for (y = 0; y < BLOCK_HEIGHT; ++y)
-			for (x = 0; x < BLOCK_WIDTH; ++x)
-				block[y * BLOCK_WIDTH + x] = (short)(start + range * (x / (float)(BLOCK_WIDTH - 1)));
-	}
-	else
-	{
-		for (y = 0; y < BLOCK_HEIGHT; ++y)
-			for (x = 0; x < BLOCK_WIDTH; ++x)
-				block[y * BLOCK_WIDTH + x] = (short)(start + range * (y / (float)(BLOCK_HEIGHT - 1)));
-	}
-}
-
-int main(int argc, char **argv)
-{
-	unsigned int		output_width;
-	unsigned int		output_height;
-	double			acceptable_error;
-	int			prompt;
-	Display			*display;
-	Window			root, window;
-	const unsigned int	mc_types[2] = {XVMC_MOCOMP | XVMC_MPEG_2, XVMC_IDCT | XVMC_MPEG_2};
-	XvPortID		port_num;
-	int			surface_type_id;
-	unsigned int		is_overlay, intra_unsigned;
-	int			colorkey;
-	XvMCContext		context;
-	XvMCSurface		surface;
-	XvMCBlockArray		block_array;
-	XvMCMacroBlockArray	mb_array;
-	int			mbx, mby, bx, by;
-	XvMCMacroBlock		*mb;
-	short			*blocks;
-	int			quit = 0;
-
-	ParseArgs(argc, argv, &output_width, &output_height, &acceptable_error, &prompt);
-
-	display = XOpenDisplay(NULL);
-
-	if (!GetPort
-	(
-		display,
-		INPUT_WIDTH,
-		INPUT_HEIGHT,
-		XVMC_CHROMA_FORMAT_420,
-    		mc_types,
-    		2,
-    		&port_num,
-    		&surface_type_id,
-    		&is_overlay,
-    		&intra_unsigned
-	))
-	{
-		XCloseDisplay(display);
-		error(1, 0, "Error, unable to find a good port.\n");
-	}
-
-	if (is_overlay)
-	{
-		Atom xv_colorkey = XInternAtom(display, "XV_COLORKEY", 0);
-		XvGetPortAttribute(display, port_num, xv_colorkey, &colorkey);
-	}
-
-	root = XDefaultRootWindow(display);
-	window = XCreateSimpleWindow(display, root, 0, 0, output_width, output_height, 0, 0, colorkey);
-
-	assert(XvMCCreateContext(display, port_num, surface_type_id, INPUT_WIDTH, INPUT_HEIGHT, XVMC_DIRECT, &context) == Success);
-	assert(XvMCCreateSurface(display, &context, &surface) == Success);
-	assert(XvMCCreateBlocks(display, &context, NUM_MACROBLOCKS * BLOCKS_PER_MACROBLOCK, &block_array) == Success);
-	assert(XvMCCreateMacroBlocks(display, &context, NUM_MACROBLOCKS, &mb_array) == Success);
-
-	mb = mb_array.macro_blocks;
-	blocks = block_array.blocks;
-
-	for (mby = 0; mby < INPUT_HEIGHT_IN_MACROBLOCKS; ++mby)
-		for (mbx = 0; mbx < INPUT_WIDTH_IN_MACROBLOCKS; ++mbx)
-		{
-			mb->x = mbx;
-			mb->y = mby;
-			mb->macroblock_type = XVMC_MB_TYPE_INTRA;
-			/*mb->motion_type = ;*/
-			/*mb->motion_vertical_field_select = ;*/
-			mb->dct_type = XVMC_DCT_TYPE_FRAME;
-			/*mb->PMV[0][0][0] = ;
-			mb->PMV[0][0][1] = ;
-			mb->PMV[0][1][0] = ;
-			mb->PMV[0][1][1] = ;
-			mb->PMV[1][0][0] = ;
-			mb->PMV[1][0][1] = ;
-			mb->PMV[1][1][0] = ;
-			mb->PMV[1][1][1] = ;*/
-			mb->index = (mby * INPUT_WIDTH_IN_MACROBLOCKS + mbx) * BLOCKS_PER_MACROBLOCK;
-			mb->coded_block_pattern = 0x3F;
-
-			mb++;
-
-			for (by = 0; by < MACROBLOCK_HEIGHT_IN_BLOCKS; ++by)
-				for (bx = 0; bx < MACROBLOCK_WIDTH_IN_BLOCKS; ++bx)
-				{
-					const int start = 16, stop = 235, range = stop - start;
-
-					Gradient
-					(
-						blocks,
-						(short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH) / (float)(INPUT_WIDTH - 1))),
-						(short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH + BLOCK_WIDTH - 1) / (float)(INPUT_WIDTH - 1))),
-						1
-					);
-
-					blocks += BLOCK_SIZE;
-				}
-
-			for (by = 0; by < MACROBLOCK_HEIGHT_IN_BLOCKS / 2; ++by)
-				for (bx = 0; bx < MACROBLOCK_WIDTH_IN_BLOCKS / 2; ++bx)
-				{
-					const int start = 16, stop = 240, range = stop - start;
-
-					Gradient
-					(
-						blocks,
-						(short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH) / (float)(INPUT_WIDTH - 1))),
-						(short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH + BLOCK_WIDTH - 1) / (float)(INPUT_WIDTH - 1))),
-						1
-					);
-
-					blocks += BLOCK_SIZE;
-
-					Gradient
-					(
-						blocks,
-						(short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH) / (float)(INPUT_WIDTH - 1))),
-						(short)(start + range * ((mbx * MACROBLOCK_WIDTH + bx * BLOCK_WIDTH + BLOCK_WIDTH - 1) / (float)(INPUT_WIDTH - 1))),
-						1
-					);
-
-					blocks += BLOCK_SIZE;
-				}
-		}
-
-	XSelectInput(display, window, ExposureMask | KeyPressMask);
-	XMapWindow(display, window);
-	XSync(display, 0);
-
-	/* Test NULL context */
-	assert(XvMCRenderSurface(display, NULL, XVMC_FRAME_PICTURE, &surface, NULL, NULL, 0, NUM_MACROBLOCKS, 0, &mb_array, &block_array) == XvMCBadContext);
-	/* Test NULL surface */
-	assert(XvMCRenderSurface(display, &context, XVMC_FRAME_PICTURE, NULL, NULL, NULL, 0, NUM_MACROBLOCKS, 0, &mb_array, &block_array) == XvMCBadSurface);
-	/* Test bad picture structure */
-	assert(XvMCRenderSurface(display, &context, 0, &surface, NULL, NULL, 0, NUM_MACROBLOCKS, 0, &mb_array, &block_array) == BadValue);
-	/* Test valid params */
-	assert(XvMCRenderSurface(display, &context, XVMC_FRAME_PICTURE, &surface, NULL, NULL, 0, NUM_MACROBLOCKS, 0, &mb_array, &block_array) == Success);
-
-	/* Test NULL surface */
-	assert(XvMCPutSurface(display, NULL, window, 0, 0, INPUT_WIDTH, INPUT_HEIGHT, 0, 0, output_width, output_height, XVMC_FRAME_PICTURE) == XvMCBadSurface);
-	/* Test bad window */
-	/* XXX: X halts with a bad drawable for some reason, doesn't return BadDrawable as expected */
-	/*assert(XvMCPutSurface(display, &surface, 0, 0, 0, width, height, 0, 0, width, height, XVMC_FRAME_PICTURE) == BadDrawable);*/
-
-	if (prompt)
-	{
-		puts("Press any button to quit...");
-
-		while (!quit)
-		{
-			if (XPending(display) > 0)
-			{
-				XEvent event;
-
-				XNextEvent(display, &event);
-
-				switch (event.type)
-				{
-					case Expose:
-					{
-						/* Test valid params */
-						assert
-						(
-							XvMCPutSurface
-							(
-								display, &surface, window,
-								0, 0, INPUT_WIDTH, INPUT_HEIGHT,
-								0, 0, output_width, output_height,
-								XVMC_FRAME_PICTURE
-							) == Success
-						);
-						break;
-					}
-					case KeyPress:
-					{
-						quit = 1;
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	assert(XvMCDestroyBlocks(display, &block_array) == Success);
-	assert(XvMCDestroyMacroBlocks(display, &mb_array) == Success);
-	assert(XvMCDestroySurface(display, &surface) == Success);
-	assert(XvMCDestroyContext(display, &context) == Success);
-
-	XvUngrabPort(display, port_num, CurrentTime);
-	XDestroyWindow(display, window);
-	XCloseDisplay(display);
-
-	return 0;
-}
diff --git a/src/xvmc/tests/test_surface.c b/src/xvmc/tests/test_surface.c
deleted file mode 100644
index 06948201ac9..00000000000
--- a/src/xvmc/tests/test_surface.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include <assert.h>
-#include <error.h>
-#include "testlib.h"
-
-int main(int argc, char **argv)
-{
-	const unsigned int	width = 16, height = 16;
-	const unsigned int	mc_types[2] = {XVMC_MOCOMP | XVMC_MPEG_2, XVMC_IDCT | XVMC_MPEG_2};
-
-	Display			*display;
-	XvPortID		port_num;
-	int			surface_type_id;
-	unsigned int		is_overlay, intra_unsigned;
-	int			colorkey;
-	XvMCContext		context;
-	XvMCSurface		surface = {0};
-
-	display = XOpenDisplay(NULL);
-
-	if (!GetPort
-	(
-		display,
-		width,
-		height,
-		XVMC_CHROMA_FORMAT_420,
-    		mc_types,
-    		2,
-    		&port_num,
-    		&surface_type_id,
-    		&is_overlay,
-    		&intra_unsigned
-	))
-	{
-		XCloseDisplay(display);
-		error(1, 0, "Error, unable to find a good port.\n");
-	}
-
-	if (is_overlay)
-	{
-		Atom xv_colorkey = XInternAtom(display, "XV_COLORKEY", 0);
-		XvGetPortAttribute(display, port_num, xv_colorkey, &colorkey);
-	}
-
-	assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, XVMC_DIRECT, &context) == Success);
-
-	/* Test NULL context */
-	assert(XvMCCreateSurface(display, NULL, &surface) == XvMCBadContext);
-	/* Test NULL surface */
-	assert(XvMCCreateSurface(display, &context, NULL) == XvMCBadSurface);
-	/* Test valid params */
-	assert(XvMCCreateSurface(display, &context, &surface) == Success);
-	/* Test surface id assigned */
-	assert(surface.surface_id != 0);
-	/* Test context id assigned and correct */
-	assert(surface.context_id == context.context_id);
-	/* Test surface type id assigned and correct */
-	assert(surface.surface_type_id == surface_type_id);
-	/* Test width & height assigned and correct */
-	assert(surface.width == width && surface.height == height);
-	/* Test valid params */
-	assert(XvMCDestroySurface(display, &surface) == Success);
-	/* Test NULL surface */
-	assert(XvMCDestroySurface(display, NULL) == XvMCBadSurface);
-
-	assert(XvMCDestroyContext(display, &context) == Success);
-
-	XvUngrabPort(display, port_num, CurrentTime);
-	XCloseDisplay(display);
-
-	return 0;
-}
diff --git a/src/xvmc/tests/testlib.c b/src/xvmc/tests/testlib.c
deleted file mode 100644
index 59a03ca813f..00000000000
--- a/src/xvmc/tests/testlib.c
+++ /dev/null
@@ -1,119 +0,0 @@
-#include "testlib.h"
-#include <stdio.h>
-
-/*
-void test(int pred, const char *pred_string, const char *doc_string, const char *file, unsigned int line)
-{
-	fputs(doc_string, stderr);
-	if (!pred)
-		fprintf(stderr, " FAIL!\n\t\"%s\" at %s:%u\n", pred_string, file, line);
-	else
-		fputs(" PASS!\n", stderr);
-}
-*/
-
-int GetPort
-(
-	Display *display,
-	unsigned int width,
-	unsigned int height,
-	unsigned int chroma_format,
-	const unsigned int *mc_types,
-	unsigned int num_mc_types,
-	XvPortID *port_id,
-	int *surface_type_id,
-	unsigned int *is_overlay,
-	unsigned int *intra_unsigned
-)
-{
-	unsigned int	found_port = 0;
-	XvAdaptorInfo	*adaptor_info;
-	unsigned int	num_adaptors;
-	int		num_types;
-	int		ev_base, err_base;
-	unsigned int	i, j, k, l;
-
-	if (!XvMCQueryExtension(display, &ev_base, &err_base))
-		return 0;
-	if (XvQueryAdaptors(display, XDefaultRootWindow(display), &num_adaptors, &adaptor_info) != Success)
-		return 0;
-
-	for (i = 0; i < num_adaptors && !found_port; ++i)
-	{
-		if (adaptor_info[i].type & XvImageMask)
-		{
-			XvMCSurfaceInfo *surface_info = XvMCListSurfaceTypes(display, adaptor_info[i].base_id, &num_types);
-
-			if (surface_info)
-			{
-				for (j = 0; j < num_types && !found_port; ++j)
-				{
-					if
-					(
-						surface_info[j].chroma_format == chroma_format &&
-						surface_info[j].max_width >= width &&
-						surface_info[j].max_height >= height
-					)
-					{
-						for (k = 0; k < num_mc_types && !found_port; ++k)
-						{
-							if (surface_info[j].mc_type == mc_types[k])
-							{
-								for (l = 0; l < adaptor_info[i].num_ports && !found_port; ++l)
-								{
-									if (XvGrabPort(display, adaptor_info[i].base_id + l, CurrentTime) == Success)
-									{
-										*port_id = adaptor_info[i].base_id + l;
-										*surface_type_id = surface_info[j].surface_type_id;
-										*is_overlay = surface_info[j].flags & XVMC_OVERLAID_SURFACE;
-										*intra_unsigned = surface_info[j].flags & XVMC_INTRA_UNSIGNED;
-										found_port = 1;
-									}
-								}
-							}
-						}
-					}
-				}
-
-				XFree(surface_info);
-			}
-		}
-	}
-
-	XvFreeAdaptorInfo(adaptor_info);
-
-	return found_port;
-}
-
-unsigned int align(unsigned int value, unsigned int alignment)
-{
-	return (value + alignment - 1) & ~(alignment - 1);
-}
-
-/* From the glibc manual */
-int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y)
-{
-	/* Perform the carry for the later subtraction by updating y. */
-	if (x->tv_usec < y->tv_usec)
-	{
-		int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1;
-		y->tv_usec -= 1000000 * nsec;
-		y->tv_sec += nsec;
-	}
-	if (x->tv_usec - y->tv_usec > 1000000)
-	{
-		int nsec = (x->tv_usec - y->tv_usec) / 1000000;
-		y->tv_usec += 1000000 * nsec;
-		y->tv_sec -= nsec;
-	}
-
-	/*
-	 * Compute the time remaining to wait.
-	 * tv_usec is certainly positive.
-	 */
-	result->tv_sec = x->tv_sec - y->tv_sec;
-	result->tv_usec = x->tv_usec - y->tv_usec;
-
-	/* Return 1 if result is negative. */
-	return x->tv_sec < y->tv_sec;
-}
diff --git a/src/xvmc/tests/testlib.h b/src/xvmc/tests/testlib.h
deleted file mode 100644
index af71ad74e17..00000000000
--- a/src/xvmc/tests/testlib.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef testlib_h
-#define testlib_h
-
-/*
-#define TEST(pred, doc)	test(pred, #pred, doc, __FILE__, __LINE__)
-
-void test(int pred, const char *pred_string, const char *doc_string, const char *file, unsigned int line);
-*/
-
-#include <sys/time.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/XvMClib.h>
-
-/*
- * display: IN			A valid X display
- * width, height: IN		Surface size that the port must display
- * chroma_format: IN		Chroma format that the port must display
- * mc_types, num_mc_types: IN	List of MC types that the port must support, first port that matches the first mc_type will be returned
- * port_id: OUT			Your port's ID
- * surface_type_id: OUT		Your port's surface ID
- * is_overlay: OUT		If 1, port uses overlay surfaces, you need to set a colorkey
- * intra_unsigned: OUT		If 1, port uses unsigned values for intra-coded blocks
- */
-int GetPort
-(
-	Display *display,
-	unsigned int width,
-	unsigned int height,
-	unsigned int chroma_format,
-	const unsigned int *mc_types,
-	unsigned int num_mc_types,
-	XvPortID *port_id,
-	int *surface_type_id,
-	unsigned int *is_overlay,
-	unsigned int *intra_unsigned
-);
-
-unsigned int align(unsigned int value, unsigned int alignment);
-
-int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);
-
-#endif
diff --git a/src/xvmc/tests/xvmc_bench.c b/src/xvmc/tests/xvmc_bench.c
deleted file mode 100644
index 97adcfc58a8..00000000000
--- a/src/xvmc/tests/xvmc_bench.c
+++ /dev/null
@@ -1,273 +0,0 @@
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <error.h>
-#include <sys/time.h>
-#include "testlib.h"
-
-#define MACROBLOCK_WIDTH		16
-#define MACROBLOCK_HEIGHT		16
-#define BLOCKS_PER_MACROBLOCK		6
-
-#define DEFAULT_INPUT_WIDTH		720
-#define DEFAULT_INPUT_HEIGHT		480
-#define DEFAULT_REPS			100
-
-#define PIPELINE_STEP_MC		1
-#define PIPELINE_STEP_CSC		2
-#define PIPELINE_STEP_SWAP		4
-
-#define MB_TYPE_I			1
-#define MB_TYPE_P			2
-#define MB_TYPE_B			4
-
-struct Config
-{
-	unsigned int input_width;
-	unsigned int input_height;
-	unsigned int output_width;
-	unsigned int output_height;
-	unsigned int pipeline;
-	unsigned int mb_types;
-	unsigned int reps;
-};
-
-void ParseArgs(int argc, char **argv, struct Config *config);
-
-void ParseArgs(int argc, char **argv, struct Config *config)
-{
-	int fail = 0;
-	int i;
-
-	config->input_width = DEFAULT_INPUT_WIDTH;
-	config->input_height = DEFAULT_INPUT_HEIGHT;
-	config->output_width = 0;
-	config->output_height = 0;
-	config->pipeline = 0;
-	config->mb_types = 0;
-	config->reps = DEFAULT_REPS;
-
-	for (i = 1; i < argc && !fail; ++i)
-	{
-		if (!strcmp(argv[i], "-iw"))
-		{
-			if (sscanf(argv[++i], "%u", &config->input_width) != 1)
-				fail = 1;
-		}
-		else if (!strcmp(argv[i], "-ih"))
-		{
-			if (sscanf(argv[++i], "%u", &config->input_height) != 1)
-				fail = 1;
-		}
-		else if (!strcmp(argv[i], "-ow"))
-		{
-			if (sscanf(argv[++i], "%u", &config->output_width) != 1)
-				fail = 1;
-		}
-		else if (!strcmp(argv[i], "-oh"))
-		{
-			if (sscanf(argv[++i], "%u", &config->output_height) != 1)
-				fail = 1;
-		}
-		else if (!strcmp(argv[i], "-p"))
-		{
-			char *token = strtok(argv[++i], ",");
-
-			while (token && !fail)
-			{
-				if (!strcmp(token, "mc"))
-					config->pipeline |= PIPELINE_STEP_MC;
-				else if (!strcmp(token, "csc"))
-					config->pipeline |= PIPELINE_STEP_CSC;
-				else if (!strcmp(token, "swp"))
-					config->pipeline |= PIPELINE_STEP_SWAP;
-				else
-					fail = 1;
-
-				if (!fail)
-					token = strtok(NULL, ",");
-			}
-		}
-		else if (!strcmp(argv[i], "-mb"))
-		{
-			char *token = strtok(argv[++i], ",");
-
-			while (token && !fail)
-			{
-				if (strcmp(token, "i"))
-					config->mb_types |= MB_TYPE_I;
-				else if (strcmp(token, "p"))
-					config->mb_types |= MB_TYPE_P;
-				else if (strcmp(token, "b"))
-					config->mb_types |= MB_TYPE_B;
-				else
-					fail = 1;
-
-				if (!fail)
-					token = strtok(NULL, ",");
-			}
-		}
-		else if (!strcmp(argv[i], "-r"))
-		{
-			if (sscanf(argv[++i], "%u", &config->reps) != 1)
-				fail = 1;
-		}
-		else
-			fail = 1;
-	}
-
-	if (fail)
-		error
-		(
-			1, 0,
-			"Bad argument.\n"
-			"\n"
-			"Usage: %s [options]\n"
-			"\t-iw <width>\tInput width\n"
-			"\t-ih <height>\tInput height\n"
-			"\t-ow <width>\tOutput width\n"
-			"\t-oh <height>\tOutput height\n"
-			"\t-p <pipeline>\tPipeline to test\n"
-			"\t-mb <mb type>\tMacroBlock types to use\n"
-			"\t-r <reps>\tRepetitions\n\n"
-			"\tPipeline steps: mc,csc,swap\n"
-			"\tMB types: i,p,b\n",
-			argv[0]
-		);
-
-	if (config->output_width == 0)
-		config->output_width = config->input_width;
-	if (config->output_height == 0)
-		config->output_height = config->input_height;
-	if (!config->pipeline)
-		config->pipeline = PIPELINE_STEP_MC | PIPELINE_STEP_CSC | PIPELINE_STEP_SWAP;
-	if (!config->mb_types)
-		config->mb_types = MB_TYPE_I | MB_TYPE_P | MB_TYPE_B;
-}
-
-int main(int argc, char **argv)
-{
-	struct Config		config;
-	Display			*display;
-	Window			root, window;
-	const unsigned int	mc_types[2] = {XVMC_MOCOMP | XVMC_MPEG_2, XVMC_IDCT | XVMC_MPEG_2};
-	XvPortID		port_num;
-	int			surface_type_id;
-	unsigned int		is_overlay, intra_unsigned;
-	int			colorkey;
-	XvMCContext		context;
-	XvMCSurface		surface;
-	XvMCBlockArray		block_array;
-	XvMCMacroBlockArray	mb_array;
-	unsigned int		mbw, mbh;
-	unsigned int		mbx, mby;
-	unsigned int		reps;
-	struct timeval		start, stop, diff;
-	double			diff_secs;
-
-	ParseArgs(argc, argv, &config);
-
-	mbw = align(config.input_width, MACROBLOCK_WIDTH) / MACROBLOCK_WIDTH;
-	mbh = align(config.input_height, MACROBLOCK_HEIGHT) / MACROBLOCK_HEIGHT;
-
-	display = XOpenDisplay(NULL);
-
-	if (!GetPort
-	(
-		display,
-		config.input_width,
-		config.input_height,
-		XVMC_CHROMA_FORMAT_420,
-    		mc_types,
-    		2,
-    		&port_num,
-    		&surface_type_id,
-    		&is_overlay,
-    		&intra_unsigned
-	))
-	{
-		XCloseDisplay(display);
-		error(1, 0, "Error, unable to find a good port.\n");
-	}
-
-	if (is_overlay)
-	{
-		Atom xv_colorkey = XInternAtom(display, "XV_COLORKEY", 0);
-		XvGetPortAttribute(display, port_num, xv_colorkey, &colorkey);
-	}
-
-	root = XDefaultRootWindow(display);
-	window = XCreateSimpleWindow(display, root, 0, 0, config.output_width, config.output_height, 0, 0, colorkey);
-
-	assert(XvMCCreateContext(display, port_num, surface_type_id, config.input_width, config.input_height, XVMC_DIRECT, &context) == Success);
-	assert(XvMCCreateSurface(display, &context, &surface) == Success);
-	assert(XvMCCreateBlocks(display, &context, mbw * mbh * BLOCKS_PER_MACROBLOCK, &block_array) == Success);
-	assert(XvMCCreateMacroBlocks(display, &context, mbw * mbh, &mb_array) == Success);
-
-	for (mby = 0; mby < mbh; ++mby)
-		for (mbx = 0; mbx < mbw; ++mbx)
-		{
-			mb_array.macro_blocks[mby * mbw + mbx].x = mbx;
-			mb_array.macro_blocks[mby * mbw + mbx].y = mby;
-			mb_array.macro_blocks[mby * mbw + mbx].macroblock_type = XVMC_MB_TYPE_INTRA;
-			/*mb->motion_type = ;*/
-			/*mb->motion_vertical_field_select = ;*/
-			mb_array.macro_blocks[mby * mbw + mbx].dct_type = XVMC_DCT_TYPE_FRAME;
-			/*mb->PMV[0][0][0] = ;
-			mb->PMV[0][0][1] = ;
-			mb->PMV[0][1][0] = ;
-			mb->PMV[0][1][1] = ;
-			mb->PMV[1][0][0] = ;
-			mb->PMV[1][0][1] = ;
-			mb->PMV[1][1][0] = ;
-			mb->PMV[1][1][1] = ;*/
-			mb_array.macro_blocks[mby * mbw + mbx].index = (mby * mbw + mbx) * BLOCKS_PER_MACROBLOCK;
-			mb_array.macro_blocks[mby * mbw + mbx].coded_block_pattern = 0x3F;
-		}
-
-	XSelectInput(display, window, ExposureMask | KeyPressMask);
-	XMapWindow(display, window);
-	XSync(display, 0);
-
-	gettimeofday(&start, NULL);
-
-	for (reps = 0; reps < config.reps; ++reps)
-	{
-		if (config.pipeline & PIPELINE_STEP_MC)
-		{
-			assert(XvMCRenderSurface(display, &context, XVMC_FRAME_PICTURE, &surface, NULL, NULL, 0, mbw * mbh, 0, &mb_array, &block_array) == Success);
-			assert(XvMCFlushSurface(display, &surface) == Success);
-		}
-		if (config.pipeline & PIPELINE_STEP_CSC)
-			assert(XvMCPutSurface(display, &surface, window, 0, 0, config.input_width, config.input_height, 0, 0, config.output_width, config.output_height, XVMC_FRAME_PICTURE) == Success);
-	}
-
-	gettimeofday(&stop, NULL);
-
-	timeval_subtract(&diff, &stop, &start);
-	diff_secs = (double)diff.tv_sec + (double)diff.tv_usec / 1000000.0;
-
-	printf("XvMC Benchmark\n");
-	printf("Input: %u,%u\nOutput: %u,%u\n", config.input_width, config.input_height, config.output_width, config.output_height);
-	printf("Pipeline: ");
-	if (config.pipeline & PIPELINE_STEP_MC)
-		printf("|mc|");
-	if (config.pipeline & PIPELINE_STEP_CSC)
-		printf("|csc|");
-	if (config.pipeline & PIPELINE_STEP_SWAP)
-		printf("|swap|");
-	printf("\n");
-	printf("Reps: %u\n", config.reps);
-	printf("Total time: %.2lf (%.2lf reps / sec)\n", diff_secs, config.reps / diff_secs);
-
-	assert(XvMCDestroyBlocks(display, &block_array) == Success);
-	assert(XvMCDestroyMacroBlocks(display, &mb_array) == Success);
-	assert(XvMCDestroySurface(display, &surface) == Success);
-	assert(XvMCDestroyContext(display, &context) == Success);
-
-	XvUngrabPort(display, port_num, CurrentTime);
-	XDestroyWindow(display, window);
-	XCloseDisplay(display);
-
-	return 0;
-}
diff --git a/src/xvmc/xvmc_private.h b/src/xvmc/xvmc_private.h
deleted file mode 100644
index 1e3dd561c66..00000000000
--- a/src/xvmc/xvmc_private.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef xvmc_private_h
-#define xvmc_private_h
-
-#include <X11/Xlib.h>
-#include <X11/extensions/XvMClib.h>
-
-#define BLOCK_SIZE_SAMPLES 64
-#define BLOCK_SIZE_BYTES (BLOCK_SIZE_SAMPLES * 2)
-
-struct pipe_video_context;
-struct pipe_surface;
-struct pipe_fence_handle;
-
-typedef struct
-{
-	struct pipe_video_context *vpipe;
-	struct pipe_surface *backbuffer;
-} XvMCContextPrivate;
-
-typedef struct
-{
-	struct pipe_video_surface *pipe_vsfc;
-	struct pipe_fence_handle *render_fence;
-	struct pipe_fence_handle *disp_fence;
-	
-	/* Some XvMC functions take a surface but not a context,
-	   so we keep track of which context each surface belongs to. */
-	XvMCContext *context;
-} XvMCSurfacePrivate;
-
-#endif /* xvmc_private_h */