Roderick Colenbrander : wined3d: Don' t flush in D3D RealizePalette without a palette.

[Alexandre Julliard]

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

Author: Roderick Colenbrander <thunderbird2k(a)gmx.net>
Date:   Thu Feb 21 18:21:34 2008 +0100

wined3d: Don't flush in D3D RealizePalette without a palette.

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index f1217d9..c74c80f 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3581,9 +3581,10 @@ HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) {
         SetDIBColorTable(This->hDC, 0, 256, col);
     }
 
-    /* Propagate the changes to the drawable.
+    /* Propagate the changes to the drawable when we have a palette. This function is also called
+     * when the palette is removed.
      * TODO: in case of hardware p8 palettes we should only upload the palette. */
-    if(This->resource.usage & WINED3DUSAGE_RENDERTARGET)
+    if(pal && (This->resource.usage & WINED3DUSAGE_RENDERTARGET))
         IWineD3DSurface_LoadLocation(iface, SFLAG_INDRAWABLE, NULL);
 
     return WINED3D_OK;