Stefan Dösinger : wined3d: Update the surface locations in Present.
Alexandre Julliard
julliard at winehq.org
Tue Aug 5 07:26:41 CDT 2008
Module: wine
Branch: master
Commit: b0c4673779f0d4e3b8fde7356016b876ddeeffa8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0c4673779f0d4e3b8fde7356016b876ddeeffa8
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Thu Jul 24 13:38:10 2008 -0500
wined3d: Update the surface locations in Present.
---
dlls/wined3d/swapchain.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 77655d0..318c220 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -309,11 +309,30 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO
IWineD3DSurfaceImpl *back = (IWineD3DSurfaceImpl *) This->backBuffer[0];
if(front->resource.size == back->resource.size) {
+ DWORD fbflags;
flip_surface(front, back);
+
+ /* Tell the front buffer surface that is has been modified. However,
+ * the other locations were preserved during that, so keep the flags.
+ * This serves to update the emulated overlay, if any
+ */
+ fbflags = front->Flags;
+ IWineD3DSurface_ModifyLocation(This->frontBuffer, SFLAG_INDRAWABLE, TRUE);
+ front->Flags = fbflags;
} else {
IWineD3DSurface_ModifyLocation((IWineD3DSurface *) front, SFLAG_INDRAWABLE, TRUE);
IWineD3DSurface_ModifyLocation((IWineD3DSurface *) back, SFLAG_INDRAWABLE, TRUE);
}
+ } else {
+ IWineD3DSurface_ModifyLocation(This->frontBuffer, SFLAG_INDRAWABLE, TRUE);
+ /* If the swapeffect is DISCARD, the back buffer is undefined. That means the SYSMEM
+ * and INTEXTURE copies can keep their old content if they have any defined content.
+ * If the swapeffect is COPY, the content remains the same. If it is FLIP however,
+ * the texture / sysmem copy needs to be reloaded from the drawable
+ */
+ if(This->presentParms.SwapEffect == WINED3DSWAPEFFECT_FLIP) {
+ IWineD3DSurface_ModifyLocation(This->backBuffer[0], SFLAG_INDRAWABLE, TRUE);
+ }
}
if(This->presentParms.PresentationInterval != WINED3DPRESENT_INTERVAL_IMMEDIATE && GL_SUPPORT(SGI_VIDEO_SYNC)) {
More information about the wine-cvs
mailing list