H. Verbeet : wined3d: Use ModifyLocation() to force a reload on color key change.

Alexandre Julliard julliard at winehq.org
Tue Jul 1 08:27:32 CDT 2008


Module: wine
Branch: master
Commit: d5cbb8375e191d9169611881e4625fe0e75a39bb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d5cbb8375e191d9169611881e4625fe0e75a39bb

Author: H. Verbeet <hverbeet at gmail.com>
Date:   Mon Jun 30 23:03:42 2008 +0200

wined3d: Use ModifyLocation() to force a reload on color key change.

Just unsetting SFLAG_INTEXTURE doesn't work for FBOs because the
drawable and texture are the same there (and ModifyLocation() is the
correct way to do this anyway). Fixes another ddraw test failure with
FBO ORM.

---

 dlls/wined3d/surface.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 48e13fe..0171e31 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2281,7 +2281,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BO
         IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL);
         /* Make sure the texture is reloaded because of the color key change, this kills performance though :( */
         /* TODO: This is not necessarily needed with hw palettized texture support */
-        This->Flags &= ~SFLAG_INTEXTURE;
+        IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE);
     } else {
         TRACE("surface is already in texture\n");
         return WINED3D_OK;




More information about the wine-cvs mailing list