Henri Verbeet : ddraw: Get rid of some redundant code in IDirect3DImpl_GetCaps().

Alexandre Julliard julliard at winehq.org
Mon Jan 7 13:42:20 CST 2013


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Sun Jan  6 14:44:09 2013 +0100

ddraw: Get rid of some redundant code in IDirect3DImpl_GetCaps().

dwTextureBlendCaps is overwritten later, and (potentially) uninitialized here.

---

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

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 97b071f..205bf5d 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -4740,11 +4740,6 @@ HRESULT IDirect3DImpl_GetCaps(const struct wined3d *wined3d, D3DDEVICEDESC *desc
         D3DPTFILTERCAPS_MAGFLINEAR       | D3DPTFILTERCAPS_MAGFANISOTROPIC     | D3DPTFILTERCAPS_MAGFAFLATCUBIC      |
         D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC);
 
-    desc7->dpcLineCaps.dwTextureBlendCaps &= (
-        D3DPTBLENDCAPS_DECAL             | D3DPTBLENDCAPS_MODULATE             | D3DPTBLENDCAPS_DECALALPHA           |
-        D3DPTBLENDCAPS_MODULATEALPHA     | D3DPTBLENDCAPS_DECALMASK            | D3DPTBLENDCAPS_MODULATEMASK         |
-        D3DPTBLENDCAPS_COPY              | D3DPTBLENDCAPS_ADD);
-
     desc7->dpcLineCaps.dwTextureAddressCaps &= (
         D3DPTADDRESSCAPS_WRAP            | D3DPTADDRESSCAPS_MIRROR             | D3DPTADDRESSCAPS_CLAMP              |
         D3DPTADDRESSCAPS_BORDER          | D3DPTADDRESSCAPS_INDEPENDENTUV);




More information about the wine-cvs mailing list