diff options
| author | Nicolai Hähnle <[email protected]> | 2009-09-21 13:26:50 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2009-09-21 13:26:50 +0200 |
| commit | 81c7561d9d3faf70ac22c6a5f3fbea18f53eed92 (patch) | |
| tree | 5ec097e0e1fe99804104d3a56923c16edf1533aa /src/xvmc/context.c | |
| parent | f02f63997ce65530788a6dfcb28f11790a14d938 (diff) | |
| parent | 3083ba38f4c884b32cd0460607b5064b6b7008d2 (diff) | |
Merge branch 'master' into r300-compiler
There were additional non-textual conflicts.
Conflicts:
src/gallium/drivers/r300/r300_tgsi_to_rc.c
src/mesa/drivers/dri/r300/compiler/r3xx_vertprog.c
src/mesa/drivers/dri/r300/compiler/radeon_program.c
src/mesa/drivers/dri/r300/compiler/radeon_program_alu.c
Diffstat (limited to 'src/xvmc/context.c')
| -rw-r--r-- | src/xvmc/context.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; } |