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 c74508d22528548940db3c8ac6a350064ca445e9.

Browse Source
This commit is contained in:
Zebediah Figura
2021-05-11 21:18:28 -05:00
parent 7f18df4633
commit 234a9fe775
7 changed files with 81 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,40 +1,32 @@
From 61b1b94434e2aaf3565051d49f1c7ebdecd8f1a2 Mon Sep 17 00:00:00 2001
From 37da9535927a82b7faf9ea40fa2de37a5270b71b 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)
---
dlls/d3d11/device.c | 11 +++++++++++
dlls/d3d11/device.c | 10 ++++++++++
dlls/nvapi/nvapi.c | 29 +++++++++++++++++++++++++++++
dlls/nvapi/tests/nvapi.c | 17 +++++++++++++++++
include/wine/wined3d.h | 2 ++
4 files changed, 59 insertions(+)
4 files changed, 58 insertions(+)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 2738ff1a5bd..3e8f90297c7 100644
index 0819918b2a1..c5a64307359 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -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);
+ struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1( (ID3D11DeviceContext1*)iface);
TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
@@ -361,6 +362,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11De
@@ -355,6 +355,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_context_QueryInterface(ID3D11Devic
{
*out = &context->ID3D11Multithread_iface;
}
+ else if (IsEqualGUID(iid, &IID_IWineD3DDevice))
+ {
+ *out = device->wined3d_device;
+ *out = context->device->wined3d_device;
+ return S_OK;
+ }
else
{
WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
@@ -4268,6 +4274,11 @@ static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface
@@ -4264,6 +4269,11 @@ static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface
{
*out = &device->IWineDXGIDeviceParent_iface;
}
@@ -150,7 +142,7 @@ index c8b66ac2fa3..87327c0e79b 100644
/* d3d9 tests */
wc.lpfnWndProc = DefWindowProcA;
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 18dab157834..188c2a3cad1 100644
index dd1c15f14ed..62895974e50 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -29,6 +29,8 @@