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

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-05-21 12:07:42 +10:00
parent e3ec587726
commit f308782dad
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
patches/nvapi-Stub_DLL/0021-Revert-wined3d-No-longer-export-wined3d_device_set_r.patch
View File

@@ -1,4 +1,4 @@
From e18fe7fddfdde4a97f9a5e76203ab34f62a1cc4d Mon Sep 17 00:00:00 2001
From 7b855cbf5192392bb0fb2c2fc0ce158886ae220f Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 6 May 2021 08:36:06 +1000
Subject: [PATCH] Revert "wined3d: No longer export
@@ -12,10 +12,10 @@ This reverts commit 2b924c7f4168345cef498e0c36c471d3c9c088e9.
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index b317206518b..aa998642e2e 100644
index b62b07fd51e..a699e21dda3 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1686,9 +1686,11 @@ struct wined3d_rasterizer_state * CDECL wined3d_device_context_get_rasterizer_st
@@ -1595,9 +1595,11 @@ struct wined3d_rasterizer_state * CDECL wined3d_device_context_get_rasterizer_st
return context->state->rasterizer_state;
}
@@ -29,30 +29,30 @@ index b317206518b..aa998642e2e 100644
{
WARN("Unhandled render state %#x.\n", state);
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index b7382e9a2a0..fe035ea37bf 100644
index ece69929c65..f8b6dac66da 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -126,6 +126,7 @@
@ cdecl wined3d_device_set_ps_resource_view(ptr long ptr)
@ cdecl wined3d_device_set_ps_sampler(ptr long ptr)
@ cdecl wined3d_device_set_rasterizer_state(ptr ptr)
@@ -73,6 +73,7 @@
@ cdecl wined3d_device_set_max_frame_latency(ptr long)
@ cdecl wined3d_device_set_multithreaded(ptr)
@ cdecl wined3d_device_set_npatch_mode(ptr float)
+@ cdecl wined3d_device_set_render_state(ptr long long)
@ cdecl wined3d_device_set_rendertarget_view(ptr long ptr long)
@ cdecl wined3d_device_set_scissor_rects(ptr long ptr)
@ cdecl wined3d_device_set_software_vertex_processing(ptr long)
@ cdecl wined3d_device_show_cursor(ptr long)
@ cdecl wined3d_device_update_texture(ptr ptr ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index c6cf17ad732..abede0accb3 100644
index ec35668856e..cab324abc9a 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2495,6 +2495,8 @@ void __cdecl wined3d_device_set_ps_resource_view(struct wined3d_device *device,
void __cdecl wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler);
void __cdecl wined3d_device_set_rasterizer_state(struct wined3d_device *device,
struct wined3d_rasterizer_state *rasterizer_state);
@@ -2402,6 +2402,8 @@ void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device,
void __cdecl wined3d_device_set_max_frame_latency(struct wined3d_device *device, unsigned int max_frame_latency);
void __cdecl wined3d_device_set_multithreaded(struct wined3d_device *device);
HRESULT __cdecl wined3d_device_set_npatch_mode(struct wined3d_device *device, float segments);
+void __cdecl wined3d_device_set_render_state(struct wined3d_device *device,
+ enum wined3d_render_state state, DWORD value);
HRESULT __cdecl wined3d_device_set_rendertarget_view(struct wined3d_device *device,
unsigned int view_idx, struct wined3d_rendertarget_view *view, BOOL set_viewport);
void __cdecl wined3d_device_set_scissor_rects(struct wined3d_device *device,
void __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software);
BOOL __cdecl wined3d_device_show_cursor(struct wined3d_device *device, BOOL show);
HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device,
--
2.30.2