Henri Verbeet : wined3d: Handle rendertargetlock_mode in surface_load_location().
Alexandre Julliard
julliard at winehq.org
Thu Nov 11 12:05:50 CST 2010
Module: wine
Branch: master
Commit: d3fd7b247b35d7c8c453afa2fc07e121ea75214b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3fd7b247b35d7c8c453afa2fc07e121ea75214b
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Nov 11 12:39:18 2010 +0100
wined3d: Handle rendertargetlock_mode in surface_load_location().
---
dlls/wined3d/surface.c | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 428be78..a18f067 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1882,15 +1882,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Unmap(IWineD3DSurface *iface)
This->Flags |= SFLAG_INSYSMEM;
}
- switch(wined3d_settings.rendertargetlock_mode) {
- case RTL_READTEX:
- surface_load_location(This, SFLAG_INTEXTURE, NULL /* partial texture loading not supported yet */);
- /* drop through */
-
- case RTL_READDRAW:
- surface_load_location(This, SFLAG_INDRAWABLE, fullsurface ? NULL : &This->dirtyRect);
- break;
- }
+ surface_load_location(This, SFLAG_INDRAWABLE, fullsurface ? NULL : &This->dirtyRect);
if (!fullsurface)
{
@@ -4415,6 +4407,9 @@ HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RE
}
else if (flag == SFLAG_INDRAWABLE)
{
+ if (wined3d_settings.rendertargetlock_mode == RTL_READTEX)
+ surface_load_location(surface, SFLAG_INTEXTURE, NULL);
+
if (surface->Flags & SFLAG_INTEXTURE)
{
RECT r;
More information about the wine-cvs
mailing list