From 72be473ad17893ecc4697644e88defa38b35f126 Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Wed, 10 Feb 2016 19:41:12 +0100 Subject: [PATCH] st/nine: Don't present if window is occluded The problem is that if one d3d present call fails, because of our occlusion check in present method, the next presentation call will send the same pixmap to the Xserver again, without waiting it is released, which is wrong. Move the present call after occlusion check to return and prevent Xpixmaps errors. Signed-off-by: Patrick Rudolph Reviewed-by: Axel Davy --- src/gallium/state_trackers/nine/swapchain9.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/gallium/state_trackers/nine/swapchain9.c b/src/gallium/state_trackers/nine/swapchain9.c index 803bd519a59..db3766063a5 100644 --- a/src/gallium/state_trackers/nine/swapchain9.c +++ b/src/gallium/state_trackers/nine/swapchain9.c @@ -778,17 +778,13 @@ NineSwapChain9_Present( struct NineSwapChain9 *This, D3DWindowBuffer *handle_temp; struct threadpool_task *task_temp; int i; - HRESULT hr = present(This, pSourceRect, pDestRect, - hDestWindowOverride, pDirtyRegion, dwFlags); + HRESULT hr; DBG("This=%p pSourceRect=%p pDestRect=%p hDestWindowOverride=%p " "pDirtyRegion=%p dwFlags=%d\n", This, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion,dwFlags); - if (hr == D3DERR_WASSTILLDRAWING) - return hr; - if (This->base.device->ex) { if (NineSwapChain9_GetOccluded(This)) { return S_PRESENT_OCCLUDED; @@ -803,6 +799,11 @@ NineSwapChain9_Present( struct NineSwapChain9 *This, } } + hr = present(This, pSourceRect, pDestRect, + hDestWindowOverride, pDirtyRegion, dwFlags); + if (hr == D3DERR_WASSTILLDRAWING) + return hr; + switch (This->params.SwapEffect) { case D3DSWAPEFFECT_FLIP: UNTESTED(4); -- 2.30.2