summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/intel/intel_screen.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-01-25 14:48:57 -0800
committerEric Anholt <eric@anholt.net>2010-01-25 22:57:33 -0800
commitc7fc9bfb2207638a479ddaff3ad108ffd9cd294a (patch)
tree1509bf8d25be747094d350196b975144e478dfd2 /src/mesa/drivers/dri/intel/intel_screen.c
parent5e1851b144a97bd577409dd5c6f3f6f45b4ff56f (diff)
Revert "intel: Use the new DRI2 flush invalidate entrypoint to signal frame done."
This reverts commit 7d4e674b212c9dc6408c13913a399bd4a2b9a1e3. It broke throttling in the non-new-DRI2 case.
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_screen.c')
-rw-r--r--src/mesa/drivers/dri/intel/intel_screen.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index fe50416642..a98600b575 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -126,29 +126,8 @@ intelDRI2Flush(__DRIdrawable *drawable)
static void
intelDRI2FlushInvalidate(__DRIdrawable *drawable)
{
- struct intel_context *intel = drawable->driContextPriv->driverPrivate;
-
intelDRI2Flush(drawable);
drawable->validBuffers = GL_FALSE;
-
- /* We're using FlushInvalidate as an indicator that a frame is
- * done. It's only called immediately after SwapBuffers, so it
- * won't affect front-buffer rendering or applications explicitly
- * managing swap regions using MESA_copy_buffer.
- *
- * Wait for the swapbuffers before the one we just emitted, so we don't
- * get too many swaps outstanding for apps that are GPU-heavy but not
- * CPU-heavy.
- *
- * Unfortunately, we don't have a handle to the batch containing the swap,
- * and getting our hands on that doesn't seem worth it, so we just use the
- * first batch we emitted after the last swap.
- */
- if (intel->first_post_swapbuffers_batch != NULL) {
- drm_intel_bo_wait_rendering(intel->first_post_swapbuffers_batch);
- drm_intel_bo_unreference(intel->first_post_swapbuffers_batch);
- intel->first_post_swapbuffers_batch = NULL;
- }
}
static const struct __DRI2flushExtensionRec intelFlushExtension = {