Attachment 8856 Details for Bug 9965 – real fix, was working on makecurrent read and sent in the wrong one

[patch] real fix, was working on makecurrent read and sent in the wrong one

via_consistensy_2.patch (text/plain), 4.25 KB, created by Miguel Marte on 2007-02-26 11:30:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miguel Marte

Created: 2007-02-26 11:30:24 UTC

Size: 4.25 KB

patch

obsolete

>diff -ur mesa/src/mesa/drivers/dri/unichrome/via_context.c mesa2/mesa/src/mesa/drivers/dri/unichrome/via_context.c
>--- mesa/src/mesa/drivers/dri/unichrome/via_context.c	2007-02-22 23:56:16.000000000 +0000
>+++ mesa2/src/mesa/drivers/dri/unichrome/via_context.c	2007-02-25 22:05:44.000000000 +0000
>@@ -768,7 +768,7 @@
> 
>    draw_buffer->drawXoff = (GLuint)(((drawable->x * bytePerPixel) & 0x1f) / 
> 			      bytePerPixel);  
>-   draw_buffer->drawX = drawable->x - draw_buffer->drawXoff;
>+   draw_buffer->drawX = drawable->x;
>    draw_buffer->drawY = drawable->y;
>    draw_buffer->drawW = drawable->w;
>    draw_buffer->drawH = drawable->h;
>@@ -782,7 +782,7 @@
> 
>       read_buffer->drawXoff = (GLuint)(((readable->x * bytePerPixel) & 0x1f) / 
> 				       bytePerPixel);  
>-      read_buffer->drawX = readable->x - read_buffer->drawXoff;
>+      read_buffer->drawX = readable->x;
>       read_buffer->drawY = readable->y;
>       read_buffer->drawW = readable->w;
>       read_buffer->drawH = readable->h;
>@@ -796,10 +796,21 @@
> 			   draw_buffer->drawY * vmesa->front.pitch + 
> 			   draw_buffer->drawX * bytePerPixel);
> 
>-   vmesa->back.orig = vmesa->back.offset;
>-   vmesa->depth.orig = vmesa->depth.offset;   
>-   vmesa->back.origMap = vmesa->back.map;
>-   vmesa->depth.origMap = vmesa->depth.map;
>+   vmesa->back.orig = vmesa->back.offset +
>+                        draw_buffer->drawY * vmesa->back.pitch +
>+                        draw_buffer->drawX * bytePerPixel;
>+
>+   vmesa->back.origMap = vmesa->back.map +
>+                        draw_buffer->drawY * vmesa->back.pitch +
>+                        draw_buffer->drawX * bytePerPixel;
>+
>+   vmesa->depth.orig = vmesa->depth.offset +
>+                        draw_buffer->drawY * vmesa->depth.pitch +
>+                        draw_buffer->drawX * bytePerPixel;
>+
>+   vmesa->depth.origMap = vmesa->depth.map +
>+                        draw_buffer->drawY * vmesa->depth.pitch +
>+                        draw_buffer->drawX * bytePerPixel;
> 
>    viaCalcViewport(vmesa->glCtx);
> }
>diff -ur mesa/src/mesa/drivers/dri/unichrome/via_ioctl.c mesa2/mesa/src/mesa/drivers/dri/unichrome/via_ioctl.c
>--- mesa/src/mesa/drivers/dri/unichrome/via_ioctl.c	2007-02-22 23:30:33.000000000 +0000
>+++ mesa2/src/mesa/drivers/dri/unichrome/via_ioctl.c	2007-02-25 22:26:00.000000000 +0000
>@@ -187,9 +187,7 @@
>       int w = pbox[i].x2 - pbox[i].x1;
>       int h = pbox[i].y2 - pbox[i].y1;
> 
>-      int offset = (buffer->orig + 
>+      int offset = (buffer->offset
>		    y * buffer->pitch + 
>		    x * bytePerPixel);
>
> 
>       viaBlit(vmesa,
> 	      buffer->bpp, 
>@@ -359,8 +357,8 @@
>       GLint w = b->x2 - b->x1;
>       GLint h = b->y2 - b->y1;
> 	
>-      GLuint src = back->orig + y * back->pitch + x * bytePerPixel;
>-      GLuint dest = front->orig + y * front->pitch + x * bytePerPixel;
>+      GLuint src = back->offset + y * back->pitch + x * bytePerPixel;
>+      GLuint dest = front->offset + y * front->pitch + x * bytePerPixel;
> 
>       viaBlit(vmesa, 
> 	      bytePerPixel << 3, 
>@@ -891,10 +889,10 @@
>       for (i = 0; i < vmesa->numClipRects; i++) {
> 	 drm_clip_rect_t b;
> 
>-	 b.x1 = pbox[i].x1 - (vrb->drawX + vrb->drawXoff);
>-	 b.x2 = pbox[i].x2 - (vrb->drawX + vrb->drawXoff);
>-	 b.y1 = pbox[i].y1 - vrb->drawY;
>-	 b.y2 = pbox[i].y2 - vrb->drawY;
>+	 b.x1 = pbox[i].x1 - vrb->drawXoff;
>+	 b.x2 = pbox[i].x2 - vrb->drawXoff;
>+	 b.y1 = pbox[i].y1;
>+	 b.y2 = pbox[i].y2;
> 
> 	 if (vmesa->scissor &&
> 	     !intersect_rect(&b, &b, &vmesa->scissorRect)) 
>diff -ur mesa/src/mesa/drivers/dri/unichrome/via_state.c mesa2/mesa/src/mesa/drivers/dri/unichrome/via_state.c
>--- mesa/src/mesa/drivers/dri/unichrome/via_state.c	2007-02-22 23:30:33.000000000 +0000
>+++ mesa2/src/mesa/drivers/dri/unichrome/via_state.c	2007-02-25 21:59:56.000000000 +0000
>@@ -732,9 +732,9 @@
>     /* See also via_translate_vertex.
>      */
>     m[MAT_SX] =   v[MAT_SX];
>-    m[MAT_TX] =   v[MAT_TX] + SUBPIXEL_X + vrb->drawXoff;
>+    m[MAT_TX] =   v[MAT_TX] + dPriv->x + SUBPIXEL_X;
>     m[MAT_SY] = - v[MAT_SY];
>-    m[MAT_TY] = - v[MAT_TY] + dPriv->h + SUBPIXEL_Y;
>+    m[MAT_TY] = - v[MAT_TY] + dPriv->y + dPriv->h + SUBPIXEL_Y;
>     m[MAT_SZ] =   v[MAT_SZ] * (1.0 / vmesa->depth_max);
>     m[MAT_TZ] =   v[MAT_TZ] * (1.0 / vmesa->depth_max);
> }

Actions: View | Splinter Review

Attachments on bug 9965: 8832 | 8848 | 8856 | 8857 | 8918 | 8961

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.