Attachment 9085 Details for Bug 10192 – r200-simplify-r200setcliprects.patch

[patch] r200-simplify-r200setcliprects.patch

r200-simplify-r200setcliprects.patch (text/plain), 4.66 KB, created by Alan Swanson on 2007-03-11 06:45:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Swanson

Created: 2007-03-11 06:45:45 UTC

Size: 4.66 KB

patch

obsolete

>diff -ur mesa/src/mesa/drivers/dri/r200/r200_context.c mesa-port/src/mesa/drivers/dri/r200/r200_context.c
>--- mesa/src/mesa/drivers/dri/r200/r200_context.c	2007-03-10 08:54:51.000000000 +0000
>+++ mesa-port/src/mesa/drivers/dri/r200/r200_context.c	2007-03-11 12:39:22.000000000 +0000
>@@ -679,7 +679,7 @@
> 	   newCtx->lastStamp != driDrawPriv->lastStamp ) {
> 	 newCtx->dri.drawable = driDrawPriv;
> 
>-	 r200SetCliprects(newCtx, GL_BACK_LEFT);
>+	 r200SetCliprects(newCtx);
> 	 r200UpdateWindow( newCtx->glCtx );
> 	 r200UpdateViewportOffset( newCtx->glCtx );
>       }
>diff -ur mesa/src/mesa/drivers/dri/r200/r200_lock.c mesa-port/src/mesa/drivers/dri/r200/r200_lock.c
>--- mesa/src/mesa/drivers/dri/r200/r200_lock.c	2007-03-10 08:54:38.000000000 +0000
>+++ mesa-port/src/mesa/drivers/dri/r200/r200_lock.c	2007-03-11 12:17:34.000000000 +0000
>@@ -92,10 +92,7 @@
> 
>    if ( rmesa->lastStamp != drawable->lastStamp ) {
>       r200UpdatePageFlipping( rmesa );
>-      if (rmesa->glCtx->DrawBuffer->_ColorDrawBufferMask[0] == BUFFER_BIT_BACK_LEFT)
>-         r200SetCliprects( rmesa, GL_BACK_LEFT );
>-      else
>-         r200SetCliprects( rmesa, GL_FRONT_LEFT );
>+      r200SetCliprects( rmesa );
>       r200UpdateViewportOffset( rmesa->glCtx );
>       driUpdateFramebufferSize(rmesa->glCtx, drawable);
>    }
>diff -ur mesa/src/mesa/drivers/dri/r200/r200_state.c mesa-port/src/mesa/drivers/dri/r200/r200_state.c
>--- mesa/src/mesa/drivers/dri/r200/r200_state.c	2007-03-10 08:54:38.000000000 +0000
>+++ mesa-port/src/mesa/drivers/dri/r200/r200_state.c	2007-03-11 12:42:24.000000000 +0000
>@@ -1691,6 +1691,11 @@
> #define SUBPIXEL_X 0.125
> #define SUBPIXEL_Y 0.125
> 
>+
>+/**
>+ * Called when window size or position changes or viewport or depth range
>+ * state is changed.  We update the hardware viewport state here.
>+ */
> void r200UpdateWindow( GLcontext *ctx )
> {
>    r200ContextPtr rmesa = R200_CONTEXT(ctx);
>@@ -1843,19 +1848,18 @@
> }
> 
> 
>-void r200SetCliprects( r200ContextPtr rmesa, GLenum mode )
>+/*
>+ * Set up the cliprects for either front or back-buffer drawing.
>+ */
>+void r200SetCliprects( r200ContextPtr rmesa )
> {
>    __DRIdrawablePrivate *const drawable = rmesa->dri.drawable;
>    __DRIdrawablePrivate *const readable = rmesa->dri.readable;
>    GLframebuffer *const draw_fb = (GLframebuffer*) drawable->driverPrivate;
>    GLframebuffer *const read_fb = (GLframebuffer*) readable->driverPrivate;
> 
>-   switch ( mode ) {
>-   case GL_FRONT_LEFT:
>-      rmesa->numClipRects = drawable->numClipRects;
>-      rmesa->pClipRects = drawable->pClipRects;
>-      break;
>-   case GL_BACK_LEFT:
>+   if (draw_fb->_ColorDrawBufferMask[0]
>+       == BUFFER_BIT_BACK_LEFT) {
>       /* Can't ignore 2d windows if we are page flipping.
>        */
>       if ( drawable->numBackClipRects == 0 || rmesa->doPageFlip ) {
>@@ -1866,11 +1870,12 @@
>          rmesa->numClipRects = drawable->numBackClipRects;
>          rmesa->pClipRects = drawable->pBackClipRects;
>       }
>-      break;
>-   default:
>-      fprintf(stderr, "bad mode in r200SetCliprects\n");
>-      return;
>    }
>+   else {
>+     /* front buffer (or none, or multiple buffers) */
>+     rmesa->numClipRects = drawable->numClipRects;
>+     rmesa->pClipRects = drawable->pClipRects;
>+  }
> 
>    if ((draw_fb->Width != drawable->w) || (draw_fb->Height != drawable->h)) {
>       _mesa_resize_framebuffer(rmesa->glCtx, draw_fb,
>@@ -1910,19 +1915,17 @@
>     */
>    switch ( ctx->DrawBuffer->_ColorDrawBufferMask[0] ) {
>    case BUFFER_BIT_FRONT_LEFT:
>-      FALLBACK( rmesa, R200_FALLBACK_DRAW_BUFFER, GL_FALSE );
>-      r200SetCliprects( rmesa, GL_FRONT_LEFT );
>-      break;
>    case BUFFER_BIT_BACK_LEFT:
>       FALLBACK( rmesa, R200_FALLBACK_DRAW_BUFFER, GL_FALSE );
>-      r200SetCliprects( rmesa, GL_BACK_LEFT );
>       break;
>    default:
>-      /* GL_NONE or GL_FRONT_AND_BACK or stereo left&right, etc */
>+      /* 0 (GL_NONE) buffers or multiple color drawing buffers */
>       FALLBACK( rmesa, R200_FALLBACK_DRAW_BUFFER, GL_TRUE );
>       return;
>    }
> 
>+   r200SetCliprects( rmesa );
>+
>    /* We'll set the drawing engine's offset/pitch parameters later
>     * when we update other state.
>     */
>diff -ur mesa/src/mesa/drivers/dri/r200/r200_state.h mesa-port/src/mesa/drivers/dri/r200/r200_state.h
>--- mesa/src/mesa/drivers/dri/r200/r200_state.h	2006-12-05 23:42:18.000000000 +0000
>+++ mesa-port/src/mesa/drivers/dri/r200/r200_state.h	2007-03-11 12:18:01.000000000 +0000
>@@ -44,7 +44,7 @@
> 
> extern void r200UpdateMaterial( GLcontext *ctx );
> 
>-extern void r200SetCliprects( r200ContextPtr rmesa, GLenum mode );
>+extern void r200SetCliprects( r200ContextPtr rmesa );
> extern void r200RecalcScissorRects( r200ContextPtr rmesa );
> extern void r200UpdateViewportOffset( GLcontext *ctx );
> extern void r200UpdateWindow( GLcontext *ctx );

Actions: View | Splinter Review

Attachments on bug 10192: 8990 | 9084 | 9085

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.