Józef Kucia : wined3d: Remove PresentationIntervals from WINED3DCAPS.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0554d1761184906c7fdaf3c8764fcaaddbc49e85
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0554d1761184906c7fdaf3c87...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Mon Mar 12 13:53:47 2018 +0100

wined3d: Remove PresentationIntervals from WINED3DCAPS.

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3d8/device.c     | 2 +-
 dlls/d3d9/device.c     | 2 +-
 dlls/wined3d/directx.c | 3 ---
 include/wine/wined3d.h | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 9f92d3c..63a99b4 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -294,7 +294,7 @@ void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const WINED3DCAPS *wined3d_caps)
     caps->Caps                      = wined3d_caps->Caps;
     caps->Caps2                     = wined3d_caps->Caps2;
     caps->Caps3                     = wined3d_caps->Caps3;
-    caps->PresentationIntervals     = wined3d_caps->PresentationIntervals;
+    caps->PresentationIntervals     = D3DPRESENT_INTERVAL_IMMEDIATE | D3DPRESENT_INTERVAL_ONE;
     caps->CursorCaps                = wined3d_caps->CursorCaps;
     caps->DevCaps                   = wined3d_caps->DevCaps;
     caps->PrimitiveMiscCaps         = wined3d_caps->PrimitiveMiscCaps;
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index aac0961..f3c24c9 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -330,7 +330,7 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const WINED3DCAPS *wined3d_caps)
     caps->Caps                              = wined3d_caps->Caps;
     caps->Caps2                             = wined3d_caps->Caps2;
     caps->Caps3                             = wined3d_caps->Caps3;
-    caps->PresentationIntervals             = wined3d_caps->PresentationIntervals;
+    caps->PresentationIntervals             = D3DPRESENT_INTERVAL_IMMEDIATE | D3DPRESENT_INTERVAL_ONE;
     caps->CursorCaps                        = wined3d_caps->CursorCaps;
     caps->DevCaps                           = wined3d_caps->DevCaps;
     caps->PrimitiveMiscCaps                 = wined3d_caps->PrimitiveMiscCaps;
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index dd738f2..f18c4ac 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -5643,9 +5643,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
                                      WINED3DCAPS3_COPY_TO_VIDMEM                   |
                                      WINED3DCAPS3_COPY_TO_SYSTEMMEM;
 
-    caps->PresentationIntervals    = WINED3DPRESENT_INTERVAL_IMMEDIATE  |
-                                     WINED3DPRESENT_INTERVAL_ONE;
-
     caps->CursorCaps               = WINED3DCURSORCAPS_COLOR            |
                                      WINED3DCURSORCAPS_LOWRES;
 
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index b6a2ec3..f0c8ae3 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -1863,7 +1863,6 @@ typedef struct _WINED3DCAPS
     DWORD Caps;
     DWORD Caps2;
     DWORD Caps3;
-    DWORD PresentationIntervals;
 
     DWORD CursorCaps;
     DWORD DevCaps;