summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2010-08-05 15:19:20 +0100
committerKeith Packard <keithp@keithp.com>2010-08-10 09:29:39 -0700
commitfbd02046797185715e1a120d52e410ec78fc365f (patch)
tree4f19ecf05c0bea8b371137555f329e49e67a2c0d
parentff70848e623920779d20f35d47e9e1f34157de47 (diff)
Cygwin/X: Fix glxWinCreateDrawable() for API change
Commit 9de0e31746d5f0d9d39d11c94ec3cbc04a9935fc changed the signature of __GLXScreen's createDrawable method. Update the glxWinCreateDrawable() function in XWin's GLX provider appropriately. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Tested-by: Colin Harrison <colin.harrison@virgin.net> Signed-off-by: Keith Packard <keithp@keithp.com>
-rwxr-xr-xhw/xwin/glx/indirect.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c
index 8ec40da33..1cf82a7cc 100755
--- a/hw/xwin/glx/indirect.c
+++ b/hw/xwin/glx/indirect.c
@@ -375,10 +375,12 @@ static __GLXscreen *glxWinScreenProbe(ScreenPtr pScreen);
static __GLXcontext *glxWinCreateContext(__GLXscreen *screen,
__GLXconfig *modes,
__GLXcontext *baseShareContext);
-static __GLXdrawable *glxWinCreateDrawable(__GLXscreen *screen,
+static __GLXdrawable *glxWinCreateDrawable(ClientPtr client,
+ __GLXscreen *screen,
DrawablePtr pDraw,
- int type,
XID drawId,
+ int type,
+ XID glxDrawId,
__GLXconfig *conf);
static Bool glxWinRealizeWindow(WindowPtr pWin);
@@ -901,10 +903,12 @@ glxWinDrawableDestroy(__GLXdrawable *base)
}
static __GLXdrawable *
-glxWinCreateDrawable(__GLXscreen *screen,
+glxWinCreateDrawable(ClientPtr client,
+ __GLXscreen *screen,
DrawablePtr pDraw,
- int type,
XID drawId,
+ int type,
+ XID glxDrawId,
__GLXconfig *conf)
{
__GLXWinDrawable *glxPriv;
@@ -916,7 +920,7 @@ glxWinCreateDrawable(__GLXscreen *screen,
memset(glxPriv, 0, sizeof *glxPriv);
- if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, drawId, conf)) {
+ if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, glxDrawId, conf)) {
free(glxPriv);
return NULL;
}