svn merge ^/branches/released .

4 files changed, 16 insertions, 11 deletions

diff --git a/xorg-server/glx/glapi.c b/xorg-server/glx/glapi.c
index 5174124d9..c11454b1f 100644
--- a/xorg-server/glx/glapi.c
+++ b/xorg-server/glx/glapi.c
@@ -84,11 +84,9 @@ static void init_glapi_relocs(void);
 /*@{*/

 #if defined(GLX_USE_TLS)

 

-PUBLIC TLS struct _glapi_table * _glapi_tls_Dispatch

-    __attribute__((tls_model("initial-exec"))) = NULL;

+PUBLIC TLS struct _glapi_table * _glapi_tls_Dispatch = NULL;

 

-PUBLIC TLS void * _glapi_tls_Context

-    __attribute__((tls_model("initial-exec")));

+PUBLIC TLS void * _glapi_tls_Context;

 

 PUBLIC const struct _glapi_table *_glapi_Dispatch = NULL;

 PUBLIC const void *_glapi_Context = NULL;

diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h
index 98f3913a9..2595087f9 100644
--- a/xorg-server/glx/glapi.h
+++ b/xorg-server/glx/glapi.h
@@ -101,7 +101,6 @@ _GLAPI_EXPORT extern const void *_glapi_Context;
 _GLAPI_EXPORT extern const struct _glapi_table *_glapi_Dispatch;

 

 _GLAPI_EXPORT extern __thread void * _glapi_tls_Context

-    __attribute__((tls_model("initial-exec")));

 

 # define GET_DISPATCH() _glapi_tls_Dispatch

 # define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) _glapi_tls_Context

diff --git a/xorg-server/glx/glthread.h b/xorg-server/glx/glthread.h
index a1b0bf99a..4ad5d493d 100644
--- a/xorg-server/glx/glthread.h
+++ b/xorg-server/glx/glthread.h
@@ -233,8 +233,7 @@ _glthread_SetTSD(_glthread_TSD *, void *);
 

 #if defined(GLX_USE_TLS)

 

-extern TLS struct _glapi_table * _glapi_tls_Dispatch

-    __attribute__((tls_model("initial-exec")));

+extern TLS struct _glapi_table * _glapi_tls_Dispatch;

 

 #define GET_DISPATCH() _glapi_tls_Dispatch

 

diff --git a/xorg-server/glx/glxdri.c b/xorg-server/glx/glxdri.c
index bd04fcd13..2119d4879 100644
--- a/xorg-server/glx/glxdri.c
+++ b/xorg-server/glx/glxdri.c
@@ -820,10 +820,19 @@ static void __glXReportDamage(__DRIdrawable *driDraw,
 

     __glXenterServer(GL_FALSE);

 

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

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

-    DamageDamageRegion(pDraw, &region);

-    RegionUninit(&region);

+    if (RegionInitBoxes(&region, (BoxPtr) rects, num_rects)) {

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

+	DamageDamageRegion(pDraw, &region);

+	RegionUninit(&region);

+    }

+    else {

+	while (num_rects--) {

+	    RegionInit (&region, (BoxPtr) rects++, 1);

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

+	    DamageDamageRegion(pDraw, &region);

+	    RegionUninit(&region);

+	}

+    }

 

     __glXleaveServer(GL_FALSE);

 }