Module: wine Branch: master Commit: dd997c1de6c79caac298b1a8f6c97ed451f494dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd997c1de6c79caac298b1a8f6...
Author: Stefan Dösinger stefan@codeweavers.com Date: Mon Feb 25 10:59:53 2008 +0100
wined3d: Catch NOP palette changes.
---
dlls/wined3d/surface_base.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index da0ccbf..babb49f 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -197,6 +197,11 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD IWineD3DPaletteImpl *PalImpl = (IWineD3DPaletteImpl *) Pal; TRACE("(%p)->(%p)\n", This, Pal);
+ if(This->palette == PalImpl) { + TRACE("Nop palette change\n"); + return WINED3D_OK; + } + if(This->palette != NULL) if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) This->palette->Flags &= ~WINEDDPCAPS_PRIMARYSURFACE;