=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: dxgi: Implement IDXGIDevice1 interface.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Oct 26 09:58:34 CDT 2015
Module: wine
Branch: master
Commit: 6c9ff7df2488534b5fe43790113831b9f8a52498
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c9ff7df2488534b5fe43790113831b9f8a52498
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Mon Oct 26 02:30:23 2015 +0100
dxgi: Implement IDXGIDevice1 interface.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dxgi/device.c | 28 ++++++++++++++++++++++++++--
dlls/dxgi/dxgi_private.h | 6 ++++++
include/wine/winedxgi.idl | 2 +-
3 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c
index b7a6aa0..8645b02 100644
--- a/dlls/dxgi/device.c
+++ b/dlls/dxgi/device.c
@@ -40,6 +40,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa
if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_IDXGIObject)
|| IsEqualGUID(riid, &IID_IDXGIDevice)
+ || IsEqualGUID(riid, &IID_IDXGIDevice1)
|| IsEqualGUID(riid, &IID_IWineDXGIDevice))
{
IUnknown_AddRef(iface);
@@ -49,11 +50,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa
if (This->child_layer)
{
- TRACE("forwarding to child layer %p\n", This->child_layer);
+ TRACE("forwarding to child layer %p.\n", This->child_layer);
return IUnknown_QueryInterface(This->child_layer, riid, object);
}
- WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid));
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
*object = NULL;
return E_NOINTERFACE;
@@ -257,6 +258,26 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetGPUThreadPriority(IWineDXGIDevic
return E_NOTIMPL;
}
+static HRESULT STDMETHODCALLTYPE dxgi_device_SetMaximumFrameLatency(IWineDXGIDevice *iface, UINT max_latency)
+{
+ FIXME("iface %p, max_latency %u stub!\n", iface, max_latency);
+
+ if (max_latency > DXGI_FRAME_LATENCY_MAX)
+ return DXGI_ERROR_INVALID_CALL;
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE dxgi_device_GetMaximumFrameLatency(IWineDXGIDevice *iface, UINT *max_latency)
+{
+ FIXME("iface %p, max_latency %p stub!\n", iface, max_latency);
+
+ if (max_latency)
+ *max_latency = DXGI_FRAME_LATENCY_DEFAULT;
+
+ return E_NOTIMPL;
+}
+
/* IWineDXGIDevice methods */
static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface,
@@ -336,6 +357,9 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl =
dxgi_device_QueryResourceResidency,
dxgi_device_SetGPUThreadPriority,
dxgi_device_GetGPUThreadPriority,
+ /* IDXGIDevice1 methods */
+ dxgi_device_SetMaximumFrameLatency,
+ dxgi_device_GetMaximumFrameLatency,
/* IWineDXGIDevice methods */
dxgi_device_create_surface,
dxgi_device_create_swapchain,
diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h
index c1c178d..59b436b 100644
--- a/dlls/dxgi/dxgi_private.h
+++ b/dlls/dxgi/dxgi_private.h
@@ -37,6 +37,12 @@
#include "wine/wined3d.h"
#include "wine/winedxgi.h"
+enum dxgi_frame_latency
+{
+ DXGI_FRAME_LATENCY_DEFAULT = 3,
+ DXGI_FRAME_LATENCY_MAX = 16,
+};
+
/* Layered device */
enum dxgi_device_layer_id
{
diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl
index a6c6cce..452f022 100644
--- a/include/wine/winedxgi.idl
+++ b/include/wine/winedxgi.idl
@@ -23,7 +23,7 @@ import "dxgi.idl";
local,
uuid(3e1ff30b-c951-48c3-b010-0fb49f3dca71)
]
-interface IWineDXGIDevice : IDXGIDevice
+interface IWineDXGIDevice : IDXGIDevice1
{
HRESULT create_surface(
[in] struct wined3d_resource *wined3d_resource,
More information about the wine-cvs
mailing list