Attachment 17810 Details for Bug 16118 – Enable page flip & buffer swap code on 965

[patch] Enable page flip & buffer swap code on 965

mesa-965-pageflip-4.patch (text/plain), 4.11 KB, created by Jesse Barnes on 2008-07-21 16:48:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2008-07-21 16:48:58 UTC

Size: 4.11 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/intel/intel_buffers.c b/src/mesa/drivers/dri/intel/intel_buffers.c
>index 2a25f07..21118e1 100644
>--- a/src/mesa/drivers/dri/intel/intel_buffers.c
>+++ b/src/mesa/drivers/dri/intel/intel_buffers.c
>@@ -197,7 +197,6 @@ intelSetBackClipRects(struct intel_context *intel)
>    }
> }
> 
>-#ifdef I915
> static void
> intelUpdatePageFlipping(struct intel_context *intel,
> 			GLint areaA, GLint areaB)
>@@ -267,7 +266,6 @@ intelUpdatePageFlipping(struct intel_context *intel,
>    intel_flip_renderbuffers(intel_fb);
>    intel_draw_buffer(&intel->ctx, intel->ctx.DrawBuffer);
> }
>-#endif /* I915 */
> 
> /**
>  * This will be called whenever the currently bound window is moved/resized.
>@@ -318,9 +316,7 @@ intelWindowMoved(struct intel_context *intel)
>       GLint areaB = driIntersectArea( drw_rect, planeB_rect );
>       GLuint flags = dPriv->vblFlags;
> 
>-#ifdef I915
>       intelUpdatePageFlipping(intel, areaA, areaB);
>-#endif
> 
>       /* Update vblank info
>        */
>@@ -645,7 +641,6 @@ intel_wait_flips(struct intel_context *intel)
> static GLboolean
> intelPageFlip(const __DRIdrawablePrivate * dPriv)
> {
>-#ifdef I915
>    struct intel_context *intel;
>    int ret;
>    struct intel_framebuffer *intel_fb = dPriv->driverPrivate;
>@@ -698,40 +693,8 @@ intelPageFlip(const __DRIdrawablePrivate * dPriv)
>    intel_draw_buffer(&intel->ctx, &intel_fb->Base);
> 
>    return GL_TRUE;
>-#else
>-   return GL_FALSE;
>-#endif
> }
> 
>-#if 0
>-void
>-intelSwapBuffers(__DRIdrawablePrivate * dPriv)
>-{
>-   if (dPriv->driverPrivate) {
>-      const struct gl_framebuffer *fb
>-         = (struct gl_framebuffer *) dPriv->driverPrivate;
>-      if (fb->Visual.doubleBufferMode) {
>-         GET_CURRENT_CONTEXT(ctx);
>-         if (ctx && ctx->DrawBuffer == fb) {
>-            _mesa_notifySwapBuffers(ctx);       /* flush pending rendering */
>-         }
>-         if (intel->doPageFlip) {
>-            intelPageFlip(dPriv);
>-         }
>-         else {
>-            intelCopyBuffer(dPriv);
>-         }
>-      }
>-   }
>-   else {
>-      _mesa_problem(NULL,
>-                    "dPriv has no gl_framebuffer pointer in intelSwapBuffers");
>-   }
>-}
>-#else
>-/* Trunk version:
>- */
>-
> static GLboolean
> intelScheduleSwap(__DRIdrawablePrivate * dPriv, GLboolean *missed_target)
> {
>@@ -746,8 +709,10 @@ intelScheduleSwap(__DRIdrawablePrivate * dPriv, GLboolean *missed_target)
> 
>    if (!dPriv->vblFlags ||
>        (dPriv->vblFlags & VBLANK_FLAG_NO_IRQ) ||
>-       intelScreen->drmMinor < (intel_fb->pf_active ? 9 : 6))
>+       intelScreen->drmMinor < (intel_fb->pf_active ? 9 : 6)) {
>+	   printf("swap schedule failed: bad flags or drm minor\n");
>       return GL_FALSE;
>+   }
> 
>    interval = driGetVBlankInterval(dPriv);
> 
>@@ -756,6 +721,7 @@ intelScheduleSwap(__DRIdrawablePrivate * dPriv, GLboolean *missed_target)
>    if (dPriv->vblFlags & VBLANK_FLAG_SYNC) {
>       swap.seqtype |= DRM_VBLANK_NEXTONMISS;
>    } else if (interval == 0) {
>+	   printf("swap schedule failed: bad interval\n");
>       return GL_FALSE;
>    }
> 
>@@ -803,6 +769,7 @@ intelScheduleSwap(__DRIdrawablePrivate * dPriv, GLboolean *missed_target)
>       }
> 
>       ret = GL_FALSE;
>+      printf("swap schedule failed: vblank swap failed\n");
>    }
> 
>    UNLOCK_HARDWARE(intel);
>@@ -832,8 +799,19 @@ intelSwapBuffers(__DRIdrawablePrivate * dPriv)
> 	 _mesa_notifySwapBuffers(ctx);  /* flush pending rendering comands */
> 
>          if (!intelScheduleSwap(dPriv, &missed_target)) {
>+		 printf("schedule swap failed, trying to wait manually\n");
> 	    driWaitForVBlank(dPriv, &missed_target);
>+	    dPriv->vblSeq = missed_target;
> 
>+	    /*
>+	     * Update each buffer's vbl_pending so we don't get too out of
>+	     * sync
>+	     */
>+	    intel_get_renderbuffer(&intel_fb->Base,
>+				   BUFFER_BACK_LEFT)->vbl_pending = 
>+		    intel_get_renderbuffer(&intel_fb->Base,
>+					   BUFFER_FRONT_LEFT)->vbl_pending =
>+		    dPriv->vblSeq;
> 	    if (!intelPageFlip(dPriv)) {
> 	       intelCopyBuffer(dPriv, NULL);
> 	    }
>@@ -854,7 +832,6 @@ intelSwapBuffers(__DRIdrawablePrivate * dPriv)
>       fprintf(stderr, "%s: drawable has no context!\n", __FUNCTION__);
>    }
> }
>-#endif
> 
> void
> intelCopySubBuffer(__DRIdrawablePrivate * dPriv, int x, int y, int w, int h)

Actions: View | Splinter Review

Attachments on bug 16118: 16768 | 16777 | 16972 | 17261 | 17810

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.