Attachment 8832 Details for Bug 9965 – patch by Miguel Marte that fixes the problem

[patch] patch by Miguel Marte that fixes the problem

Mesa--unichrome-viewport.patch (text/plain), 2.97 KB, created by Benno Schulenberg on 2007-02-24 05:30:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benno Schulenberg

Created: 2007-02-24 05:30:16 UTC

Size: 2.97 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/unichrome/via_context.c b/src/mesa/drivers/dri/unichrome/via_context.c
>index bc5a414..42dfd7a 100644
>--- a/src/mesa/drivers/dri/unichrome/via_context.c
>+++ b/src/mesa/drivers/dri/unichrome/via_context.c
>@@ -788,17 +788,11 @@ void viaXMesaWindowMoved(struct via_context *vmesa)
>       read_buffer->drawH = readable->h;
>    }
> 
>-   vmesa->front.orig = (vmesa->front.offset + 
>-			draw_buffer->drawY * vmesa->front.pitch + 
>-			draw_buffer->drawX * bytePerPixel);
>-
>-   vmesa->front.origMap = (vmesa->front.map + 
>-			   draw_buffer->drawY * vmesa->front.pitch + 
>-			   draw_buffer->drawX * bytePerPixel);
>-
>+   vmesa->front.orig = vmesa->front.offset;
>+   vmesa->front.origMap = vmesa->front.map;
>    vmesa->back.orig = vmesa->back.offset;
>-   vmesa->depth.orig = vmesa->depth.offset;   
>    vmesa->back.origMap = vmesa->back.map;
>+   vmesa->depth.orig = vmesa->depth.offset;   
>    vmesa->depth.origMap = vmesa->depth.map;
> 
>    viaCalcViewport(vmesa->glCtx);
>diff --git a/src/mesa/drivers/dri/unichrome/via_ioctl.c b/src/mesa/drivers/dri/unichrome/via_ioctl.c
>index 5d102de..5eaa6fa 100644
>--- a/src/mesa/drivers/dri/unichrome/via_ioctl.c
>+++ b/src/mesa/drivers/dri/unichrome/via_ioctl.c
>@@ -891,10 +891,10 @@ void viaFlushDmaLocked(struct via_context *vmesa, GLuint flags)
>       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 --git a/src/mesa/drivers/dri/unichrome/via_state.c b/src/mesa/drivers/dri/unichrome/via_state.c
>index 30b9dc2..2f6c8cd 100644
>--- a/src/mesa/drivers/dri/unichrome/via_state.c
>+++ b/src/mesa/drivers/dri/unichrome/via_state.c
>@@ -712,12 +712,8 @@ static void viaColorMask(GLcontext *ctx,
> }
> 
> 
>-/* =============================================================
>- */
> 
>-
>-/* Using drawXoff like this is incorrect outside of locked regions.
>- * This hardware just isn't capable of private back buffers without
>+/* This hardware just isn't capable of private back buffers without
>  * glitches and/or a hefty locking scheme.
>  */
> void viaCalcViewport(GLcontext *ctx)
>@@ -729,12 +725,10 @@ void viaCalcViewport(GLcontext *ctx)
>     const GLfloat *v = ctx->Viewport._WindowMap.m;
>     GLfloat *m = vmesa->ViewportMatrix.m;
>     
>-    /* 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] + SUBPIXEL_X + dPriv->x;
>     m[MAT_SY] = - v[MAT_SY];
>-    m[MAT_TY] = - v[MAT_TY] + dPriv->h + SUBPIXEL_Y;
>+    m[MAT_TY] = - v[MAT_TY] + SUBPIXEL_Y + dPriv->y + dPriv->h;
>     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.