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

Fixed compile errors when building with -Werror

Browse Source 
NOTE: Tests are skipped.
This commit is contained in:
Alistair Leslie-Hughes
2021-06-08 09:15:19 +10:00
parent 8a3554ad85
commit daec2e3662
18 changed files with 373 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/nvapi-Stub_DLL/0021-nvapi-Implement-NvAPI_D3D11_SetDepthBoundsTest.patch
View File

@@ -1,4 +1,4 @@
From 69f7584b4837300691016624b356adae2fdd130b Mon Sep 17 00:00:00 2001
From 87d4d702d42242a9387e31a4da079066eda0471e Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Sat, 22 May 2021 18:11:07 -0500
Subject: [PATCH] nvapi: Implement NvAPI_D3D11_SetDepthBoundsTest().
@@ -12,17 +12,19 @@ Subject: [PATCH] nvapi: Implement NvAPI_D3D11_SetDepthBoundsTest().
5 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
index 8e1a9a40cce..b63685cad54 100644
index 8e1a9a40cce..85fa47bee36 100644
--- a/dlls/nvapi/nvapi.c
+++ b/dlls/nvapi/nvapi.c
@@ -27,6 +27,8 @@
@@ -27,8 +27,10 @@
#include "wine/list.h"
#include "nvapi.h"
#include "d3d9.h"
+#include "initguid.h"
+#include "wine/winedxgi.h"
#include "wine/wined3d.h"
+#include "wine/winedxgi.h"
WINE_DEFAULT_DEBUG_CHANNEL(nvapi);
@@ -680,6 +682,32 @@ static NvAPI_Status CDECL NvAPI_GPU_GetGpuCoreCount(NvPhysicalGpuHandle hPhysica
return NVAPI_OK;
@@ -115,7 +117,7 @@ index c8b66ac2fa3..b8b4750203a 100644
/* d3d9 tests */
wc.lpfnWndProc = DefWindowProcA;
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index b6550a1a4e4..2c5e67f89d7 100644
index 3884c1d6c66..17969ea9a08 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1923,7 +1923,7 @@ void CDECL wined3d_device_context_set_rasterizer_state(struct wined3d_device_con
@@ -128,10 +130,10 @@ index b6550a1a4e4..2c5e67f89d7 100644
{
TRACE("context %p, enable %d, min %.8e, max %.8e.\n", context, enable, min, max);
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 7b0737386b7..aebfe8ff34c 100644
index 11351b60a7f..1751c97ae87 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -123,6 +123,7 @@
@@ -124,6 +124,7 @@
@ cdecl wined3d_device_context_resolve_sub_resource(ptr ptr long ptr long long)
@ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long)
@ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr)
@@ -140,10 +142,10 @@ index 7b0737386b7..aebfe8ff34c 100644
@ cdecl wined3d_device_context_set_depth_stencil_view(ptr ptr)
@ cdecl wined3d_device_context_set_index_buffer(ptr ptr long long)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index f94855cf2a1..71618937858 100644
index 53ae13b7df5..52f4b0aed24 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2496,6 +2496,8 @@ void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_contex
@@ -2498,6 +2498,8 @@ void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_contex
struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask);
void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context,
enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer);

6
patches/nvapi-Stub_DLL/0022-nvapi-Implement-NvAPI_D3D11_CreateDevice-and-NvAPI_D.patch
View File

@@ -1,4 +1,4 @@
From 9d566d8cbb3a6eaa3a65b5ce43052b78c2e941fd Mon Sep 17 00:00:00 2001
From 5513b374865605f112006b73d503b8709297cef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 14 Jul 2017 09:37:11 +0200
Subject: [PATCH] nvapi: Implement NvAPI_D3D11_CreateDevice and
@@ -24,7 +24,7 @@ index 73f28fd0687..efe5c60b1f8 100644
EXTRADLLFLAGS = -mno-cygwin
diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
index b63685cad54..a0f54cda937 100644
index 85fa47bee36..8a8697b3f16 100644
--- a/dlls/nvapi/nvapi.c
+++ b/dlls/nvapi/nvapi.c
@@ -27,6 +27,7 @@
@@ -33,8 +33,8 @@ index b63685cad54..a0f54cda937 100644
#include "d3d9.h"
+#include "d3d11.h"
#include "initguid.h"
#include "wine/winedxgi.h"
#include "wine/wined3d.h"
@@ -708,6 +709,58 @@ static NvAPI_Status CDECL NvAPI_D3D11_SetDepthBoundsTest(IUnknown *unk, NvU32 en
return NVAPI_OK;
}