Stefan Dösinger : wined3d: Do not setup states for unlocking if unlocking is disabled.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Dec 29 06:47:15 CST 2006
Module: wine
Branch: master
Commit: 603038a07af6efd73aad4472a2ad0a6447403068
URL: http://source.winehq.org/git/wine.git/?a=commit;h=603038a07af6efd73aad4472a2ad0a6447403068
Author: Stefan Dösinger <stefandoesinger at gmx.at>
Date: Thu Dec 28 18:30:12 2006 +0100
wined3d: Do not setup states for unlocking if unlocking is disabled.
---
dlls/wined3d/surface.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index c030f36..b3799da 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1141,7 +1141,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp
IWineD3DSwapChainImpl *implSwapChain;
IWineD3DDevice_GetSwapChain((IWineD3DDevice *)myDevice, 0, (IWineD3DSwapChain **)&implSwapChain);
- if (backbuf || iface == implSwapChain->frontBuffer || iface == myDevice->render_targets[0]) {
+ if ((backbuf || iface == implSwapChain->frontBuffer || iface == myDevice->render_targets[0]) && wined3d_settings.rendertargetlock_mode != RTL_DISABLE) {
int tex;
ENTER_GL();
@@ -1221,7 +1221,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp
/** restore clean dirty state */
IWineD3DSurface_CleanDirtyRect(iface);
- } else {
+ } else if(wined3d_settings.rendertargetlock_mode != RTL_DISABLE) {
FIXME("unsupported unlocking to Rendering surface surf@%p usage(%s)\n", This, debug_d3dusage(This->resource.usage));
}
IWineD3DSwapChain_Release((IWineD3DSwapChain *)implSwapChain);
More information about the wine-cvs
mailing list