Henri Verbeet : wined3d: Compare the actual formats.

Alexandre Julliard julliard at winehq.org
Mon Mar 23 12:34:51 CDT 2009


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Mon Mar 23 08:30:15 2009 +0100

wined3d: Compare the actual formats.

---

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

diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c
index 941d537..401f983 100644
--- a/dlls/wined3d/surface_base.c
+++ b/dlls/wined3d/surface_base.c
@@ -1105,7 +1105,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D
         dEntry = This->resource.format_desc;
         if (Src)
         {
-            if(This->resource.format_desc != Src->resource.format_desc)
+            if (This->resource.format_desc->format != Src->resource.format_desc->format)
             {
                 Src = surface_convert_format(Src, dEntry->format);
                 if(!Src) {
@@ -1676,7 +1676,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst
             FIXME("trans arg not supported when a FOURCC surface is involved\n");
         if (dstx || dsty)
             FIXME("offset for destination surface is not supported\n");
-        if (Src->resource.format_desc != This->resource.format_desc)
+        if (Src->resource.format_desc->format != This->resource.format_desc->format)
         {
             FIXME("FOURCC->FOURCC copy only supported for the same type of surface\n");
             ret = WINED3DERR_WRONGTEXTUREFORMAT;




More information about the wine-cvs mailing list