prevent spurious texture uploads

2 files changed, 3 insertions, 12 deletions

diff --git a/src/mesa/drivers/dri/radeon/radeon_lock.c b/src/mesa/drivers/dri/radeon/radeon_lock.c
index bd52551f74..a50179c12c 100644
--- a/src/mesa/drivers/dri/radeon/radeon_lock.c
+++ b/src/mesa/drivers/dri/radeon/radeon_lock.c
@@ -132,14 +132,6 @@ static void validate_drawable( radeonContextPtr rmesa )
 {
    __DRIdrawablePrivate *dPriv = rmesa->dri.drawable;
 
-   fprintf(stderr, "%s\n", __FUNCTION__);
-
-   fprintf(stderr, 
-	   "rmesa->lastStamp %d dpriv->lastStamp %d *(dpriv->pStamp) %d\n",
-	   rmesa->lastStamp, 
-	   dPriv->lastStamp,
-	   *(dPriv->pStamp));
-
    /* The window might have moved, so we might need to get new clip
     * rects.
     *
@@ -177,7 +169,6 @@ void radeonGetLock( radeonContextPtr rmesa, GLuint flags )
    RADEONSAREAPrivPtr sarea = rmesa->sarea;
    int i;
 
-
    drmGetLock( rmesa->dri.fd, rmesa->dri.hwContext, flags );
    
    validate_drawable( rmesa );
@@ -188,8 +179,9 @@ void radeonGetLock( radeonContextPtr rmesa, GLuint flags )
       for ( i = 0 ; i < rmesa->texture.numHeaps ; i++ ) {
 	 if ( rmesa->texture.heap[i] && 
 	      sarea->texAge[i] != rmesa->texture.age[i] ) {
+
 	    radeonAgeTextures( rmesa, i );
-	    rmesa->texture.age[i] = sarea->texAge[i]++;
+	    rmesa->texture.age[i] = sarea->texAge[i];
 	    rmesa->NewGLState |= _NEW_TEXTURE;
 	 }
       }
diff --git a/src/mesa/drivers/dri/radeon/radeon_subset_tex.c b/src/mesa/drivers/dri/radeon/radeon_subset_tex.c
index e98908a031..2afdb4e11d 100644
--- a/src/mesa/drivers/dri/radeon/radeon_subset_tex.c
+++ b/src/mesa/drivers/dri/radeon/radeon_subset_tex.c
@@ -120,8 +120,6 @@ void radeonAgeTextures( radeonContextPtr rmesa, int heap )
 {
    radeonTexObjPtr t, tmp;
 
-   fprintf(stderr, "%s\n", __FUNCTION__);
-
    foreach_s ( t, tmp, &rmesa->texture.objects[heap] ) 
       radeonSwapOutTexObj( rmesa, t );
 }
@@ -369,6 +367,7 @@ static void radeonSetTexImages( radeonContextPtr rmesa,
       }
    }
 
+   rmesa->texture.age[0] = ++rmesa->sarea->texAge[0]; 
    UNLOCK_HARDWARE( rmesa );
    t->dirty_images = 0;
 }