From 6e8d21d72f35767e07081a8bee4323aaaf5e2aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 25 Feb 2008 16:14:37 -0500 Subject: Remove GetMSC DriverAPI function. The DriverAPI is internal to the DRI drivers and GetDrawableMSC obsoletes GetMSC. Also, since the DRI driver interface has not yet been released, just drop the getMSC function from the DRI interface instead using the ABI preserving version mechanism. Finally, using void pointer privates in the DRI interface is not allowed, always pass the actual types around (__DRIdrawable in this case) to enhance type safety and readability of the code. --- src/glx/x11/glxcmds.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/glx/x11') diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c index 7ff2bf700c..3b7b7b94c3 100644 --- a/src/glx/x11/glxcmds.c +++ b/src/glx/x11/glxcmds.c @@ -1953,17 +1953,9 @@ static int __glXGetVideoSyncSGI(unsigned int *count) int64_t temp; int ret; - /* - * Try to use getDrawableMSC first so we get the right - * counter... - */ - if (psc->msc->base.version >= 2 && psc->msc->getDrawableMSC) - ret = (*psc->msc->getDrawableMSC)( &psc->driScreen, - pdraw->private, - & temp); - else - ret = (*psc->msc->getMSC)( &psc->driScreen, & temp); + ret = (*psc->msc->getDrawableMSC)(&psc->driScreen, pdraw, &temp); *count = (unsigned) temp; + return (ret == 0) ? 0 : GLX_BAD_CONTEXT; } } -- cgit v1.2.3