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 8d076bc5e46cc11ec94db631e7c608f62d75cee2.

Browse Source
This commit is contained in:
Zebediah Figura
2021-04-06 17:41:23 -05:00
parent 733a420dd7
commit 0c295023f1
9 changed files with 85 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From dab5f521ad21f95aeedde39f0625541fe39d8bdf Mon Sep 17 00:00:00 2001
From 61b1b94434e2aaf3565051d49f1c7ebdecd8f1a2 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: [PATCH] nvapi: Implement NvAPI_D3D11_SetDepthBoundsTest. (v2)
@@ -11,10 +11,10 @@ Subject: [PATCH] nvapi: Implement NvAPI_D3D11_SetDepthBoundsTest. (v2)
4 files changed, 59 insertions(+)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 751afc1..ad91cdb 100644
index 2738ff1a5bd..3e8f90297c7 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -49,6 +49,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11De
@@ -347,6 +347,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11De
REFIID iid, void **out)
{
struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface);
@@ -22,7 +22,7 @@ index 751afc1..ad91cdb 100644
TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
@@ -63,6 +64,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11De
@@ -361,6 +362,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11De
{
*out = &context->ID3D11Multithread_iface;
}
@@ -34,7 +34,7 @@ index 751afc1..ad91cdb 100644
else
{
WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
@@ -3942,6 +3948,11 @@ static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface
@@ -4268,6 +4274,11 @@ static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface
{
*out = &device->IWineDXGIDeviceParent_iface;
}
@@ -47,10 +47,10 @@ index 751afc1..ad91cdb 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 b67b414..ad8266b 100644
index 8e1a9a40cce..6f2fc56b20a 100644
--- a/dlls/nvapi/nvapi.c
+++ b/dlls/nvapi/nvapi.c
@@ -23,6 +23,7 @@
@@ -20,6 +20,7 @@
#include <stdarg.h>
#define COBJMACROS
@@ -58,7 +58,7 @@ index b67b414..ad8266b 100644
#include "windef.h"
#include "winbase.h"
#include "winternl.h"
@@ -682,6 +683,33 @@ static NvAPI_Status CDECL NvAPI_GPU_GetGpuCoreCount(NvPhysicalGpuHandle hPhysica
@@ -680,6 +681,33 @@ static NvAPI_Status CDECL NvAPI_GPU_GetGpuCoreCount(NvPhysicalGpuHandle hPhysica
return NVAPI_OK;
}
@@ -92,7 +92,7 @@ index b67b414..ad8266b 100644
void* CDECL nvapi_QueryInterface(unsigned int offset)
{
static const struct
@@ -727,6 +755,7 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
@@ -725,6 +753,7 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
{0x46fbeb03, NvAPI_GPU_GetPhysicalFrameBufferSize},
{0x5a04b644, NvAPI_GPU_GetVirtualFrameBufferSize},
{0xc7026a87, NvAPI_GPU_GetGpuCoreCount},
@@ -101,7 +101,7 @@ index b67b414..ad8266b 100644
unsigned int i;
TRACE("(%x)\n", offset);
diff --git a/dlls/nvapi/tests/nvapi.c b/dlls/nvapi/tests/nvapi.c
index c8b66ac..87327c0 100644
index c8b66ac2fa3..87327c0e79b 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
@@ -150,11 +150,11 @@ index c8b66ac..87327c0 100644
/* d3d9 tests */
wc.lpfnWndProc = DefWindowProcA;
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 958ade1..4828f9c 100644
index 18dab157834..188c2a3cad1 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -32,6 +32,8 @@
@@ -29,6 +29,8 @@
#include <stdbool.h>
#include "wine/list.h"
+DEFINE_GUID(IID_IWineD3DDevice, 0xd56e2a4c, 0x5127, 0x8437, 0x65, 0x8a, 0x98, 0xc5, 0xbb, 0x78, 0x94, 0x98);
@@ -163,5 +163,5 @@ index 958ade1..4828f9c 100644
#define _FACWINED3D 0x876
--
1.9.1
2.30.2