Remove bogus division by 64 in r200UploadAGPClientSubImage().

Also add some r200EmitWait() commands, which may/may not be necessary.

1 files changed, 9 insertions, 1 deletions

diff --git a/xc/lib/GL/mesa/src/drv/r200/r200_texmem.c b/xc/lib/GL/mesa/src/drv/r200/r200_texmem.c
index 4e245a454..19cfaba97 100644
--- a/xc/lib/GL/mesa/src/drv/r200/r200_texmem.c
+++ b/xc/lib/GL/mesa/src/drv/r200/r200_texmem.c
@@ -325,7 +325,7 @@ static void r200UploadAGPClientSubImage( r200ContextPtr rmesa,
 					 GLint width, GLint height )
 {
    const struct gl_texture_format *texFormat = texImage->TexFormat;
-   GLuint pitch = (t->image[0].width * texFormat->TexelBytes) / 64;
+   GLuint pitch = t->image[0].width * texFormat->TexelBytes;
    int blit_format;
    int srcOffset;
 
@@ -354,6 +354,8 @@ static void r200UploadAGPClientSubImage( r200ContextPtr rmesa,
    width = texImage->Width;
    height = texImage->Height;
 
+   r200EmitWait( rmesa, RADEON_WAIT_3D );
+
    r200EmitBlit( rmesa, blit_format, 
 		 pitch,  
 		 srcOffset,   
@@ -365,6 +367,8 @@ static void r200UploadAGPClientSubImage( r200ContextPtr rmesa,
 		 t->image[hwlevel].y + y, 
 		 width,
 		 height );
+
+   r200EmitWait( rmesa, RADEON_WAIT_2D );
 }
 
 static void r200UploadRectSubImage( r200ContextPtr rmesa,
@@ -460,6 +464,8 @@ static void r200UploadRectSubImage( r200ContextPtr rmesa,
 	    }
 	 }
 
+	 r200EmitWait( rmesa, RADEON_WAIT_3D );
+
 	 /* Blit to framebuffer
 	  */
 	 r200EmitBlit( rmesa, 
@@ -470,6 +476,8 @@ static void r200UploadRectSubImage( r200ContextPtr rmesa,
 		       0, done, 
 		       width, lines );
 	 
+	 r200EmitWait( rmesa, RADEON_WAIT_2D );
+
 	 r200ReleaseDmaRegion( rmesa, &region, __FUNCTION__ );
 	 done += lines;
       }