svn merge "^/branches/released" .

Solved mouse motion bug in new version of dix/getevents.c

3 files changed, 5 insertions, 14 deletions

diff --git a/xorg-server/glx/glxdri.c b/xorg-server/glx/glxdri.c
index 2733cb856..99602bf66 100644
--- a/xorg-server/glx/glxdri.c
+++ b/xorg-server/glx/glxdri.c
@@ -837,9 +837,7 @@ static void __glXReportDamage(__DRIdrawable *driDraw,
 

     RegionInit(&region, (BoxPtr) rects, num_rects);

     RegionTranslate(&region, pDraw->x, pDraw->y);

-    DamageRegionAppend(pDraw, &region);

-    /* This is wrong, this needs a seperate function. */

-    DamageRegionProcessPending(pDraw);

+    DamageDamageRegion(pDraw, &region);

     RegionUninit(&region);

 

     __glXleaveServer(GL_FALSE);

@@ -1163,9 +1161,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
      */

     buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL);

     if (buffer_size > 0) {

-	if (screen->base.GLXextensions != NULL) {

-	    free(screen->base.GLXextensions);

-	}

+	free(screen->base.GLXextensions);

 

 	screen->base.GLXextensions = xnfalloc(buffer_size);

 	(void) __glXGetExtensionString(screen->glx_enable_bits, 

diff --git a/xorg-server/glx/glxdri2.c b/xorg-server/glx/glxdri2.c
index 45a1903e4..23a29cc55 100644
--- a/xorg-server/glx/glxdri2.c
+++ b/xorg-server/glx/glxdri2.c
@@ -792,9 +792,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
      */

     buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL);

     if (buffer_size > 0) {

-	if (screen->base.GLXextensions != NULL) {

-	    free(screen->base.GLXextensions);

-	}

+	free(screen->base.GLXextensions);

 

 	screen->base.GLXextensions = xnfalloc(buffer_size);

 	(void) __glXGetExtensionString(screen->glx_enable_bits, 

diff --git a/xorg-server/glx/single2.c b/xorg-server/glx/single2.c
index d0f0c83bb..63a2a9d0e 100644
--- a/xorg-server/glx/single2.c
+++ b/xorg-server/glx/single2.c
@@ -350,9 +350,7 @@ int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap)
 				      cl->GLClientextensions);

 	buf = __glXcombine_strings(buf1,

 				      cx->pGlxScreen->GLextensions);

-	if (buf1 != NULL) {

-	    free(buf1);

-	}

+	free(buf1);

 	string = buf;

     }

     else if ( name == GL_VERSION ) {

@@ -381,8 +379,7 @@ int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap)
 

     __GLX_SEND_HEADER();

     WriteToClient(client, length, (char *) string); 

-    if (buf != NULL)

-	free(buf);

+    free(buf);

 

     return Success;

 }