diff options
author | Eric Anholt <[email protected]> | 2010-11-09 14:01:52 -0800 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2010-11-09 14:03:04 -0800 |
commit | 00391c79416ffd4b6f3af0ad911b7b8210f746d1 (patch) | |
tree | 22254d62d41cd3c6abf39a20eab75ac92c3cd2ea /src/mesa | |
parent | 76360d6abc9e0195bc5c373101ae616e68b2e6e6 (diff) |
Revert "intel: Fix the client-side swapbuffers throttling."
This reverts commit 76360d6abc9e0195bc5c373101ae616e68b2e6e6. On
second thought, it turned out that sync objects also used the
wait_rendering API like this, and would need the same treatment, and
so wait_rendering itself is fixed in libdrm now.
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 60c401b75bc..de4bcde20b6 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -470,11 +470,7 @@ intel_prepare_render(struct intel_context *intel) * so we just us the first batch we emitted after the last swap. */ if (intel->need_throttle && intel->first_post_swapbuffers_batch) { - /* Can't use drm_intel_bo_wait_rendering, since that only waits - * for rendering *to* the buffer, not from it. - */ - drm_intel_gem_bo_map_gtt(intel->first_post_swapbuffers_batch); - drm_intel_gem_bo_unmap_gtt(intel->first_post_swapbuffers_batch); + 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; intel->need_throttle = GL_FALSE; |