Roderick Colenbrander : wined3d: Due to code rewrites is_color_fixup_supported is not needed anymore in RealizePalette .

[Alexandre Julliard]

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

Author: Roderick Colenbrander <thunderbird2k(a)gmail.com>
Date:   Mon Apr  5 20:05:18 2010 +0200

wined3d: Due to code rewrites is_color_fixup_supported is not needed anymore in RealizePalette.

The code in question should be executed in all cases. This also fixes
palette refresh issues when shaders / paletted textures aren't around.

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 6ced082..f0bd431 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -4276,18 +4276,13 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface)
     if (This->resource.format_desc->format == WINED3DFMT_P8_UINT
             || This->resource.format_desc->format == WINED3DFMT_P8_UINT_A8_UNORM)
     {
-        IWineD3DDeviceImpl *device = This->resource.device;
-        if((This->resource.usage & WINED3DUSAGE_RENDERTARGET) &&
-            device->blitter->color_fixup_supported(&device->adapter->gl_info, This->resource.format_desc->color_fixup))
+        if(This->resource.usage & WINED3DUSAGE_RENDERTARGET)
         {
             /* Make sure the texture is up to date. This call doesn't do anything if the texture is already up to date. */
             IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL);
 
             /* We want to force a palette refresh, so mark the drawable as not being up to date */
             IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE);
-
-            /* Force a palette refresh by re-uploading to the drawable */
-            IWineD3DSurface_LoadLocation(iface, SFLAG_INDRAWABLE, NULL);
         } else {
             if(!(This->Flags & SFLAG_INSYSMEM)) {
                 TRACE("Palette changed with surface that does not have an up to date system memory copy\n");