diff options
| author | Keith Whitwell <[email protected]> | 2010-02-04 12:46:21 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2010-02-08 13:05:35 +0000 |
| commit | 01923fb72d755b319dde521c3c81a20caa95b540 (patch) | |
| tree | 3ae61e1d3dd0a14a12ce187ae74d3e653b101db3 /src/glx/x11/dri2_glx.c | |
| parent | e891a9cc3acb6d1d7d3cd994b375d15a2a3c552f (diff) | |
glx: permit building with older protocol headers
I'd like to be able to build mesa on current distro releases without
having to upgrade from the standard dri2proto and glproto headers. With
this change I'm able to build on ancient releases such as Ubuntu 9-10...
In general, it would be nice to be able to build-test mesa to check for
unintended breakages without having to follow the external dependencies
of every group working on the codebase.
Seems to introduce no changes to the build of libglapi.a when tested against
new versions of the headers.
Diffstat (limited to 'src/glx/x11/dri2_glx.c')
| -rw-r--r-- | src/glx/x11/dri2_glx.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/glx/x11/dri2_glx.c b/src/glx/x11/dri2_glx.c index 7a5740a4d89..6200df94f7f 100644 --- a/src/glx/x11/dri2_glx.c +++ b/src/glx/x11/dri2_glx.c @@ -380,8 +380,10 @@ dri2SwapBuffers(__GLXDRIdrawable *pdraw, int64_t target_msc, int64_t divisor, return 0; } +#ifdef X_DRI2SwapBuffers DRI2SwapBuffers(pdraw->psc->dpy, pdraw->xDrawable, target_msc, divisor, remainder, &ret); +#endif #if __DRI2_FLUSH_VERSION >= 2 if (pdraw->psc->f) @@ -576,18 +578,24 @@ dri2CreateScreen(__GLXscreenConfigs * psc, int screen, psp->swapBuffers = dri2SwapBuffers; psp->waitGL = dri2WaitGL; psp->waitX = dri2WaitX; + psp->getDrawableMSC = NULL; + psp->waitForMSC = NULL; + psp->waitForSBC = NULL; + psp->setSwapInterval = NULL; + psp->getSwapInterval = NULL; + if (pdp->driMinor >= 2) { +#ifdef X_DRI2GetMSC psp->getDrawableMSC = dri2DrawableGetMSC; +#endif +#ifdef X_DRI2WaitMSC psp->waitForMSC = dri2WaitForMSC; psp->waitForSBC = dri2WaitForSBC; +#endif +#ifdef X_DRI2SwapInterval psp->setSwapInterval = dri2SetSwapInterval; psp->getSwapInterval = dri2GetSwapInterval; - } else { - psp->getDrawableMSC = NULL; - psp->waitForMSC = NULL; - psp->waitForSBC = NULL; - psp->setSwapInterval = NULL; - psp->getSwapInterval = NULL; +#endif } /* DRI2 suports SubBuffer through DRI2CopyRegion, so it's always @@ -643,8 +651,10 @@ dri2CreateDisplay(Display * dpy) pdp->driPatch = 0; pdp->swapAvailable = 0; +#ifdef X_DRI2SwapBuffers if (pdp->driMinor >= 2) pdp->swapAvailable = 1; +#endif pdp->base.destroyDisplay = dri2DestroyDisplay; pdp->base.createScreen = dri2CreateScreen; |