From 2ef8c60e558938686196bf8ff4d22fd57903bf4c Mon Sep 17 00:00:00 2001
From: Cooper Yuan <cooperyuan@gmail.com>
Date: Tue, 15 Sep 2009 13:16:56 +0800
Subject: [PATCH] xvmc: Generate new resource ID in _XIDHandler, otherwise it's
 invalid.

---
 src/xvmc/context.c    | 3 +++
 src/xvmc/subpicture.c | 5 ++++-
 src/xvmc/surface.c    | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/xvmc/context.c b/src/xvmc/context.c
index 273f6580292..9c2b6648bb5 100644
--- a/src/xvmc/context.c
+++ b/src/xvmc/context.c
@@ -1,6 +1,7 @@
 #include <assert.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/XvMClib.h>
+#include <X11/Xlibint.h>
 #include <pipe/p_context.h>
 #include <vl_display.h>
 #include <vl_screen.h>
@@ -137,6 +138,7 @@ Status XvMCCreateContext(Display *display, XvPortID port, int surface_type_id, i
 	struct vlScreen		*vl_scrn;
 	struct vlContext	*vl_ctx;
 	struct pipe_context	*pipe;
+	Display			*dpy = display;
 
 	assert(display);
 
@@ -176,6 +178,7 @@ Status XvMCCreateContext(Display *display, XvPortID port, int surface_type_id, i
 	context->port = port;
 	context->privData = vl_ctx;
 
+	SyncHandle();
 	return Success;
 }
 
diff --git a/src/xvmc/subpicture.c b/src/xvmc/subpicture.c
index c8f70c90d0c..09e9c98e6af 100644
--- a/src/xvmc/subpicture.c
+++ b/src/xvmc/subpicture.c
@@ -2,6 +2,7 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/Xvlib.h>
 #include <X11/extensions/XvMC.h>
+#include <X11/Xlibint.h>
 
 Status XvMCCreateSubpicture
 (
@@ -13,6 +14,7 @@ Status XvMCCreateSubpicture
 	int xvimage_id
 )
 {
+	Display *dpy = display;
 	assert(display);
 	
 	if (!context)
@@ -38,7 +40,8 @@ Status XvMCCreateSubpicture
 	subpicture->component_order[2] = 0;
 	subpicture->component_order[3] = 0;
 	/* TODO: subpicture->privData = ;*/
-	
+
+	SyncHandle();
 	return Success;
 }
 
diff --git a/src/xvmc/surface.c b/src/xvmc/surface.c
index 7c5f45bd346..fea351b84f0 100644
--- a/src/xvmc/surface.c
+++ b/src/xvmc/surface.c
@@ -1,6 +1,7 @@
 #include <assert.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/XvMC.h>
+#include <X11/Xlibint.h>
 #include <vl_display.h>
 #include <vl_screen.h>
 #include <vl_context.h>
@@ -61,6 +62,7 @@ Status XvMCCreateSurface(Display *display, XvMCContext *context, XvMCSurface *su
 {
 	struct vlContext *vl_ctx;
 	struct vlSurface *vl_sfc;
+	Display *dpy = display;
 
 	assert(display);
 
@@ -90,6 +92,7 @@ Status XvMCCreateSurface(Display *display, XvMCContext *context, XvMCSurface *su
 	surface->height = context->height;
 	surface->privData = vl_sfc;
 
+	SyncHandle();
 	return Success;
 }
 
-- 
2.30.2