xserver: Branch 'master'

[Ian Romanick]

 glx/glxdri.c  |    6 +++++-
 glx/glxdri2.c |    4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 51ae4d6bbfd95cac8a9cdefcd6f22fbe21a6cb9d
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Mon Feb 16 12:08:28 2009 -0800

    glx: Add comments around some extension string weirdness

diff --git a/glx/glxdri.c b/glx/glxdri.c
index b3b3e27..cc6d939 100644
--- a/glx/glxdri.c
+++ b/glx/glxdri.c
@@ -1136,6 +1136,10 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
 
     __glXScreenInit(&screen->base, pScreen);
 
+    /* The first call simply determines the length of the extension string.
+     * This allows us to allocate some memory to hold the extension string,
+     * but it requires that we call __glXGetExtensionString a second time.
+     */
     buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL);
     if (buffer_size > 0) {
 	if (screen->base.GLXextensions != NULL) {
@@ -1150,7 +1154,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
     __glXsetEnterLeaveServerFuncs(__glXDRIenterServer, __glXDRIleaveServer);
 
     screen->enterVT = pScrn->EnterVT;
-    pScrn->EnterVT = glxDRIEnterVT; 
+    pScrn->EnterVT = glxDRIEnterVT;
     screen->leaveVT = pScrn->LeaveVT;
     pScrn->LeaveVT = glxDRILeaveVT;
 
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 66e0889..b12293a 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -583,6 +583,10 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
 
     __glXScreenInit(&screen->base, pScreen);
 
+    /* The first call simply determines the length of the extension string.
+     * This allows us to allocate some memory to hold the extension string,
+     * but it requires that we call __glXGetExtensionString a second time.
+     */
     buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL);
     if (buffer_size > 0) {
 	if (screen->base.GLXextensions != NULL) {