xserver: Branch 'master' - 2 commits

[Michel Dänzer]

 glx/glxdri.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a4d62bbf215894bad8e19d99f7330c637d3d49e3
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Tue Nov 4 11:27:53 2008 +0100

    AIGLX: Reinstate call to driver texOffsetFinish hook.
    
    It was accidentally lost when factoring out __glXDRIdoReleaseTexImage, so this
    is a regression fix and should probably be backported to server-1.5-branch.

diff --git a/glx/glxdri.c b/glx/glxdri.c
index 50a5179..090e7ef 100644
--- a/glx/glxdri.c
+++ b/glx/glxdri.c
@@ -189,6 +189,8 @@ __glXDRIdoReleaseTexImage(__GLXDRIscreen *screen, __GLXDRIdrawable *drawable)
 
 	for (i = 0; i < lastOverride; i++) {
 	    if (texOffsetOverride[i] == drawable) {
+		if (screen->texOffsetFinish)
+		    screen->texOffsetFinish((PixmapPtr)drawable->base.pDraw);
 
 		texOffsetOverride[i] = NULL;
 
commit 27f1ad466cd9662d638f4a8e59beafc32a8b2a8f
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Tue Nov 4 11:26:03 2008 +0100

    AIGLX: Don't truncate offset returned by driver texOffsetStart hook on 32 bit.

diff --git a/glx/glxdri.c b/glx/glxdri.c
index c43e7c3..50a5179 100644
--- a/glx/glxdri.c
+++ b/glx/glxdri.c
@@ -103,7 +103,7 @@ struct __GLXDRIdrawable {
 #ifdef __DRI_TEX_OFFSET
     GLint texname;
     __GLXDRIcontext *ctx;
-    unsigned long offset;
+    unsigned long long offset;
     DamagePtr pDamage;
 #endif
 };