diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-08-31 15:09:02 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-08-31 15:09:02 +0100 |
| commit | 8724bb25c325f4a03f36389d553b00f87930ced9 (patch) | |
| tree | d2b505c5966f0a0d01732a56bb07f940548e0d99 /hw/xfree86/dri2/dri2.c | |
| parent | cad2feacb52c7e38236db39df06c3fc11ba3aae1 (diff) | |
| parent | dfc03ef3fda3572db590c2096272c990d434163e (diff) | |
Merge tag 'xorg-server-1.12.4' into cygwin-release-1.12xserver-cygwin-1.12.4-1cygwin-release-1.12
xorg-server-1.12.4
Conflicts:
glx/glxcmds.c
hw/xfree86/modes/xf86Crtc.c
os/utils.c
pseudoramiX/pseudoramiX.c
Diffstat (limited to 'hw/xfree86/dri2/dri2.c')
| -rw-r--r-- | hw/xfree86/dri2/dri2.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c index 591ff3ace..156d4986e 100644 --- a/hw/xfree86/dri2/dri2.c +++ b/hw/xfree86/dri2/dri2.c @@ -280,8 +280,9 @@ DRI2AddDrawableRef(DRI2DrawablePtr pPriv, XID id, XID dri2_id, } int -DRI2CreateDrawable(ClientPtr client, DrawablePtr pDraw, XID id, - DRI2InvalidateProcPtr invalidate, void *priv) +DRI2CreateDrawable2(ClientPtr client, DrawablePtr pDraw, XID id, + DRI2InvalidateProcPtr invalidate, void *priv, + XID *dri2_id_out) { DRI2DrawablePtr pPriv; XID dri2_id; @@ -298,9 +299,19 @@ DRI2CreateDrawable(ClientPtr client, DrawablePtr pDraw, XID id, if (rc != Success) return rc; + if (dri2_id_out) + *dri2_id_out = dri2_id; + return Success; } +int +DRI2CreateDrawable(ClientPtr client, DrawablePtr pDraw, XID id, + DRI2InvalidateProcPtr invalidate, void *priv) +{ + return DRI2CreateDrawable2(client, pDraw, id, invalidate, priv, NULL); +} + static int DRI2DrawableGone(pointer p, XID id) { |