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.

1 files changed, 2 insertions, 10 deletions

diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index 7ff2bf700c9..3b7b7b94c35 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;
       }
    }