frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cygwin/X: Fix glxWinCreateDrawable() for API change 

Commit 9de0e31746 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>
This commit is contained in:
Jon TURNEY 2010-08-05 15:19:20 +01:00 committed by Keith Packard
parent ff70848e62
commit fbd0204679
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/xwin/glx/indirect.c
View File

@ -375,10 +375,12 @@ static __GLXscreen *glxWinScreenProbe(ScreenPtr pScreen);
static __GLXcontext *glxWinCreateContext(__GLXscreen *screen, static __GLXcontext *glxWinCreateContext(__GLXscreen *screen,
__GLXconfig *modes, __GLXconfig *modes,
__GLXcontext *baseShareContext); __GLXcontext *baseShareContext);
static __GLXdrawable *glxWinCreateDrawable(__GLXscreen *screen, static __GLXdrawable *glxWinCreateDrawable(ClientPtr client,
__GLXscreen *screen,
DrawablePtr pDraw, DrawablePtr pDraw,
int type,
XID drawId, XID drawId,
int type,
XID glxDrawId,
__GLXconfig *conf); __GLXconfig *conf);
static Bool glxWinRealizeWindow(WindowPtr pWin); static Bool glxWinRealizeWindow(WindowPtr pWin);
@ -901,10 +903,12 @@ glxWinDrawableDestroy(__GLXdrawable *base)
} }
static __GLXdrawable * static __GLXdrawable *
glxWinCreateDrawable(__GLXscreen *screen, glxWinCreateDrawable(ClientPtr client,
__GLXscreen *screen,
DrawablePtr pDraw, DrawablePtr pDraw,
int type,
XID drawId, XID drawId,
int type,
XID glxDrawId,
__GLXconfig *conf) __GLXconfig *conf)
{ {
__GLXWinDrawable *glxPriv; __GLXWinDrawable *glxPriv;
@ -916,7 +920,7 @@ glxWinCreateDrawable(__GLXscreen *screen,
memset(glxPriv, 0, sizeof *glxPriv); 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); free(glxPriv);
return NULL; return NULL;
} }