Stefan Dösinger : ddraw: Don't re-write the surface' s pixelformat.

[Alexandre Julliard]

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

Author: Stefan Dösinger 
Date:   Fri Aug 26 02:07:55 2011 +0200

ddraw: Don't re-write the surface's pixelformat.

The pixelformat is passed in in ddraw form in the desc parameter, which is copied
into the surface's DDSURFACEDESC2 structure, so the format is already set.

---

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

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index c6ae89b..1f25437 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -5215,7 +5215,6 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr
         return hr;
     }

-    surface->surface_desc.dwFlags |= DDSD_PIXELFORMAT;
     wined3d_resource = wined3d_surface_get_resource(surface->wined3d_surface);
     wined3d_resource_get_desc(wined3d_resource, &wined3d_desc);

@@ -5224,7 +5223,6 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr
     {
         FIXME("IWineD3DSurface::GetDesc returned WINED3DFMT_UNKNOWN.\n");
     }
-    PixelFormat_WineD3DtoDD(&surface->surface_desc.u4.ddpfPixelFormat, format);

/* Anno 1602 stores the pitch right after surface creation, so make sure
      * it's there. TODO: Test other fourcc formats. */