wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 784b617ae936f97118e18624da85cc9de900e3a7

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-05-01 12:32:17 +10:00
parent 4af8ffc7f2
commit d13e9fa487
46 changed files with 965 additions and 670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
patches/nvapi-Stub_DLL/0019-nvapi-Implement-NvAPI_D3D11_SetDepthBoundsTest.patch
View File

@@ -1,7 +1,7 @@
From 03ef8b6a13aa0d5b59da879d19585d4e1d64eb2d Mon Sep 17 00:00:00 2001
From ddb398fc71e14607ecc400f049b04a93181f4987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 7 Jul 2017 23:56:16 +0200
Subject: nvapi: Implement NvAPI_D3D11_SetDepthBoundsTest. (v2)
Subject: [PATCH] nvapi: Implement NvAPI_D3D11_SetDepthBoundsTest. (v2)
---
dlls/d3d11/device.c | 12 ++++++++++++
@@ -11,22 +11,19 @@ Subject: nvapi: Implement NvAPI_D3D11_SetDepthBoundsTest. (v2)
4 files changed, 60 insertions(+)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 421af5a0449..d3660a12e50 100644
index d8059e5..497ed9b 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -981,16 +981,23 @@ static inline struct d3d_device *device_from_immediate_ID3D11DeviceContext(ID3D1
static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11DeviceContext *iface,
@@ -4453,6 +4453,8 @@ static inline struct d3d11_deferred_context *impl_from_deferred_ID3D11DeviceCont
static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_QueryInterface(ID3D11DeviceContext *iface,
REFIID riid, void **out)
{
+ struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface);
+ struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1( (ID3D11DeviceContext1*)iface);
+
TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
if (IsEqualGUID(riid, &IID_ID3D11DeviceContext)
|| IsEqualGUID(riid, &IID_ID3D11DeviceChild)
|| IsEqualGUID(riid, &IID_IUnknown))
{
ID3D11DeviceContext_AddRef(iface);
@@ -4463,6 +4465,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_QueryInterface(ID3D11Dev
*out = iface;
return S_OK;
}
@@ -38,7 +35,7 @@ index 421af5a0449..d3660a12e50 100644
WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
*out = NULL;
@@ -5951,6 +5958,11 @@ static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface
@@ -7148,6 +7155,11 @@ static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface
{
*out = &device->IWineDXGIDeviceParent_iface;
}
@@ -51,7 +48,7 @@ index 421af5a0449..d3660a12e50 100644
{
WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
index 12ddb0d871f..22894d6a093 100644
index 12ddb0d..22894d6 100644
--- a/dlls/nvapi/nvapi.c
+++ b/dlls/nvapi/nvapi.c
@@ -22,6 +22,7 @@
@@ -105,7 +102,7 @@ index 12ddb0d871f..22894d6a093 100644
unsigned int i;
TRACE("(%x)\n", offset);
diff --git a/dlls/nvapi/tests/nvapi.c b/dlls/nvapi/tests/nvapi.c
index c8b66ac2fa3..87327c0e79b 100644
index c8b66ac..87327c0 100644
--- a/dlls/nvapi/tests/nvapi.c
+++ b/dlls/nvapi/tests/nvapi.c
@@ -45,6 +45,7 @@ static NvAPI_Status (CDECL* pNvAPI_EnumNvidiaDisplayHandle)(NvU32 thisEnum, NvDi
@@ -154,7 +151,7 @@ index c8b66ac2fa3..87327c0e79b 100644
/* d3d9 tests */
wc.lpfnWndProc = DefWindowProcA;
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 8b014db9b92..b8fb5503e53 100644
index 37d5770..6772524 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -32,6 +32,8 @@
@@ -167,5 +164,5 @@ index 8b014db9b92..b8fb5503e53 100644
#define _FACWINED3D 0x876
--
2.13.1
1.9.1