diff options
| author | Michel Dänzer <[email protected]> | 2010-03-30 12:01:31 +0200 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2010-03-30 12:01:31 +0200 |
| commit | e5c7d1e1c8ccb493c63e33d017c28b5cf4a55829 (patch) | |
| tree | 0c73ae897b0cfb09ad21e13e27f45bb11b82e75b /src/glx | |
| parent | aa1a79036003c2aeaae24877da66e9b46a059cad (diff) | |
| parent | 07c6d94cd7272524ef06b2a787667e5d626137d2 (diff) | |
Merge branch '7.8'
Conflicts:
Makefile
src/mesa/main/version.h
Resolved by keeping version strings from master (also in the intel driver).
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/dri2_glx.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index 5b0f335db6a..14788b89bea 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -202,6 +202,8 @@ dri2CreateDrawable(__GLXscreenConfigs * psc, return &pdraw->base; } +#ifdef X_DRI2GetMSC + static int dri2DrawableGetMSC(__GLXscreenConfigs *psc, __GLXDRIdrawable *pdraw, int64_t *ust, int64_t *msc, int64_t *sbc) @@ -209,6 +211,11 @@ dri2DrawableGetMSC(__GLXscreenConfigs *psc, __GLXDRIdrawable *pdraw, return DRI2GetMSC(psc->dpy, pdraw->xDrawable, ust, msc, sbc); } +#endif + + +#ifdef X_DRI2WaitMSC + static int dri2WaitForMSC(__GLXDRIdrawable *pdraw, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc) @@ -225,6 +232,8 @@ dri2WaitForSBC(__GLXDRIdrawable *pdraw, int64_t target_sbc, int64_t *ust, sbc); } +#endif /* X_DRI2WaitMSC */ + static void dri2CopySubBuffer(__GLXDRIdrawable *pdraw, int x, int y, int width, int height) { @@ -448,6 +457,8 @@ dri2GetBuffersWithFormat(__DRIdrawable * driDrawable, return pdraw->buffers; } +#ifdef X_DRI2SwapInterval + static void dri2SetSwapInterval(__GLXDRIdrawable *pdraw, int interval) { @@ -465,6 +476,8 @@ dri2GetSwapInterval(__GLXDRIdrawable *pdraw) return priv->swap_interval; } +#endif /* X_DRI2SwapInterval */ + static const __DRIdri2LoaderExtension dri2LoaderExtension = { {__DRI_DRI2_LOADER, __DRI_DRI2_LOADER_VERSION}, dri2GetBuffers, |