From f308782dadd2231f1e287e676aeb95e5a1e28e29 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 21 May 2021 12:07:42 +1000 Subject: [PATCH] Rebase against dff85646517526562644c23648d11596daeb26d0. --- ...o-longer-export-wined3d_device_set_r.patch | 36 +++++++++---------- patches/patchinstall.sh | 2 +- ...SWVP-vertex-shader-constants-limit-i.patch | 24 ++++++------- staging/upstream-commit | 2 +- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/patches/nvapi-Stub_DLL/0021-Revert-wined3d-No-longer-export-wined3d_device_set_r.patch b/patches/nvapi-Stub_DLL/0021-Revert-wined3d-No-longer-export-wined3d_device_set_r.patch index 4ef53320..f077db64 100644 --- a/patches/nvapi-Stub_DLL/0021-Revert-wined3d-No-longer-export-wined3d_device_set_r.patch +++ b/patches/nvapi-Stub_DLL/0021-Revert-wined3d-No-longer-export-wined3d_device_set_r.patch @@ -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 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 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 849d64a6..97b65faf 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "44b30c42cbb231e3ea54a47f6ecc19e641e5f889" + echo "dff85646517526562644c23648d11596daeb26d0" } # Show version information diff --git a/patches/wined3d-SWVP-shaders/0004-wined3d-Support-SWVP-vertex-shader-constants-limit-i.patch b/patches/wined3d-SWVP-shaders/0004-wined3d-Support-SWVP-vertex-shader-constants-limit-i.patch index bbd3d781..3f66715f 100644 --- a/patches/wined3d-SWVP-shaders/0004-wined3d-Support-SWVP-vertex-shader-constants-limit-i.patch +++ b/patches/wined3d-SWVP-shaders/0004-wined3d-Support-SWVP-vertex-shader-constants-limit-i.patch @@ -1,4 +1,4 @@ -From 9379d1dcd14d684a07763f28b20384c8a65bd146 Mon Sep 17 00:00:00 2001 +From 734d51c817f0a3d3775716fbe3e66ccbbd04ad65 Mon Sep 17 00:00:00 2001 From: Paul Gofman Date: Mon, 25 Feb 2019 15:05:12 +0300 Subject: [PATCH] wined3d: Support SWVP vertex shader constants limit in state @@ -61,10 +61,10 @@ index 40585d5257d..6377addec24 100644 hr = IDirect3DDevice9_BeginScene(device); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c -index bb1b949c3e1..e2618f20d16 100644 +index f2ed842a0bb..1181e311075 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c -@@ -3924,7 +3924,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, +@@ -3558,7 +3558,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, const struct wined3d_saved_states *changed = &stateblock->changed; const unsigned int word_bit_count = sizeof(DWORD) * CHAR_BIT; struct wined3d_device_context *context = &device->cs->c; @@ -73,9 +73,9 @@ index bb1b949c3e1..e2618f20d16 100644 struct wined3d_range range; uint32_t map; -@@ -3935,9 +3935,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, +@@ -3569,9 +3569,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if (changed->pixelShader) - wined3d_device_set_pixel_shader(device, state->ps); + wined3d_device_context_set_shader(context, WINED3D_SHADER_TYPE_PIXEL, state->ps); + vs_uniform_count = wined3d_device_get_vs_uniform_count(device); + @@ -87,7 +87,7 @@ index bb1b949c3e1..e2618f20d16 100644 wined3d_device_set_vs_consts_f(device, range.offset, range.size, &state->vs_consts_f[range.offset]); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c -index db9efa70186..50551f0a663 100644 +index e6a5f3f3b88..1f719688b9d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1910,7 +1910,7 @@ static void shader_glsl_update_float_vertex_constants(struct wined3d_device *dev @@ -186,10 +186,10 @@ index 1f1ba262336..b939da02e61 100644 default: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h -index b37cc260c92..c2d66362966 100644 +index 3c2d2da4ac9..8ce9eeb0dda 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h -@@ -3694,7 +3694,7 @@ struct wined3d_state +@@ -3696,7 +3696,7 @@ struct wined3d_state struct wined3d_shader_resource_view *shader_resource_view[WINED3D_SHADER_TYPE_COUNT][MAX_SHADER_RESOURCE_VIEWS]; struct wined3d_unordered_access_view *unordered_access_view[WINED3D_PIPELINE_COUNT][MAX_UNORDERED_ACCESS_VIEWS]; @@ -198,7 +198,7 @@ index b37cc260c92..c2d66362966 100644 struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I]; BOOL vs_consts_b[WINED3D_MAX_CONSTS_B]; -@@ -3867,6 +3867,15 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, +@@ -3869,6 +3869,15 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_device_uninit_3d(struct wined3d_device *device) DECLSPEC_HIDDEN; @@ -214,7 +214,7 @@ index b37cc260c92..c2d66362966 100644 struct wined3d_device_no3d { struct wined3d_device d; -@@ -4590,7 +4599,7 @@ struct wined3d_vertex_declaration +@@ -4593,7 +4602,7 @@ struct wined3d_vertex_declaration struct wined3d_saved_states { @@ -224,10 +224,10 @@ index b37cc260c92..c2d66362966 100644 WORD vertexShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ uint32_t ps_consts_f[WINED3D_BITMAP_SIZE(WINED3D_MAX_PS_CONSTS_F)]; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h -index b3f803b2614..841fb9f9aee 100644 +index 85416b4594a..7a2829179a4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h -@@ -2189,7 +2189,7 @@ struct wined3d_stateblock_state +@@ -2191,7 +2191,7 @@ struct wined3d_stateblock_state int base_vertex_index; struct wined3d_shader *vs; diff --git a/staging/upstream-commit b/staging/upstream-commit index 4bfe67e9..24a818f3 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -44b30c42cbb231e3ea54a47f6ecc19e641e5f889 +dff85646517526562644c23648d11596daeb26d0