diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-26 10:26:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-26 10:26:21 +0200 |
| commit | be8a3ecf0bebc7134452778070cd83b7decf7f71 (patch) | |
| tree | e3a5d81a99754c393062ed811bece6e0787e3767 /xorg-server/hw/kdrive/ephyr/ephyrdri.c | |
| parent | 7403278d95051a554e2cbec3fafdde8ce9c6d200 (diff) | |
| parent | 5ee5b91b019005aa27273dff01388a68c12be293 (diff) | |
| download | vcxsrv-be8a3ecf0bebc7134452778070cd83b7decf7f71.tar.gz vcxsrv-be8a3ecf0bebc7134452778070cd83b7decf7f71.tar.bz2 vcxsrv-be8a3ecf0bebc7134452778070cd83b7decf7f71.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa fontconfig libX11 libxcb libxcb/xcb-proto xkeyboard-config git update 26 Aug 2013
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr/ephyrdri.c')
| -rw-r--r-- | xorg-server/hw/kdrive/ephyr/ephyrdri.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdri.c b/xorg-server/hw/kdrive/ephyr/ephyrdri.c index 50554364c..3a4a06301 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrdri.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrdri.c @@ -137,18 +137,19 @@ ephyrDRIGetClientDriverName(int a_screen, Bool ephyrDRICreateContext(int a_screen, int a_visual_id, - XID *a_returned_ctxt_id, drm_context_t * a_hw_ctxt) + CARD32 ctxt_id, drm_context_t * a_hw_ctxt) { Display *dpy = hostx_get_display(); Bool is_ok = FALSE; Visual v; + XID returned_ctxt_id = ctxt_id; EPHYR_LOG("enter. screen:%d, visual:%d\n", a_screen, a_visual_id); memset(&v, 0, sizeof(v)); v.visualid = a_visual_id; is_ok = XF86DRICreateContext(dpy, DefaultScreen(dpy), - &v, a_returned_ctxt_id, a_hw_ctxt); + &v, &returned_ctxt_id, a_hw_ctxt); EPHYR_LOG("leave:%d\n", is_ok); return is_ok; } |