From 86a67397f79263a0d3e173123cfb12c33cfab024 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 7 Feb 2023 13:58:00 +1100 Subject: [PATCH] Rebase against a958b5aebfeed4538a4091f49996ae30ee9803fc. --- ...ys-check-for-debug-symbols-in-BINDIR.patch | 8 ++--- patches/patchinstall.sh | 2 +- ...SWVP-vertex-shader-constants-limit-i.patch | 30 +++++++++---------- staging/upstream-commit | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch b/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch index 18175a82..70825a10 100644 --- a/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch +++ b/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch @@ -1,4 +1,4 @@ -From 8c78d1203c965927d0a0e6fcde31dd651cc704db Mon Sep 17 00:00:00 2001 +From f78fc333748a6c4f664bb10ee2115c86690b3b16 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 6 Oct 2014 05:06:06 +0200 Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR. @@ -22,7 +22,7 @@ index 22be2612eeb..2e11bb2b62d 100644 C_SRCS = \ diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c -index 404c7c11dbb..e0779e4e3a7 100644 +index 3c1e225e195..4468f7fa4ed 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1445,6 +1445,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, @@ -30,9 +30,9 @@ index 404c7c11dbb..e0779e4e3a7 100644 ret = search_unix_path(filename, process_getenv(pcs, L"LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf) + || search_unix_path(filename, BINDIR, elf_load_file_cb, &load_elf) - || search_dll_path(pcs, filename, elf_load_file_cb, &load_elf); + || search_dll_path(pcs, filename, IMAGE_FILE_MACHINE_UNKNOWN, elf_load_file_cb, &load_elf); } -- -2.34.1 +2.39.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index e058182a..51a00187 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "a4ed65d57721adade08440b9cabf44e3394fc3ad" + echo "a958b5aebfeed4538a4091f49996ae30ee9803fc" } # 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 4aa9a8a2..1429dd25 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 050a25663f403b0286453e90c4abd4e35df668eb Mon Sep 17 00:00:00 2001 +From e8a4c08a831329bf42e8b6a80519d013a899d5ef 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 @@ -15,10 +15,10 @@ Subject: [PATCH] wined3d: Support SWVP vertex shader constants limit in state 7 files changed, 31 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c -index 5c4417a2568..21bd83fc1e0 100644 +index 0a95e819018..83d05cf8bc5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c -@@ -6971,13 +6971,10 @@ static void test_vertex_shader_constant(void) +@@ -6973,13 +6973,10 @@ static void test_vertex_shader_constant(void) ok(consts_swvp == 8192, "Unexpected consts_swvp %lu.\n", consts_swvp); hr = IDirect3DDevice9_SetVertexShaderConstantF(device, consts + 0, c, 1); @@ -32,7 +32,7 @@ index 5c4417a2568..21bd83fc1e0 100644 ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_SetVertexShaderConstantF(device, consts_swvp - 1, c, 1); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); -@@ -7002,7 +6999,6 @@ static void test_vertex_shader_constant(void) +@@ -7004,7 +7001,6 @@ static void test_vertex_shader_constant(void) IDirect3DDevice9_SetSoftwareVertexProcessing(device, 0); hr = IDirect3DDevice9_SetVertexShaderConstantF(device, consts + 0, c, 1); @@ -40,7 +40,7 @@ index 5c4417a2568..21bd83fc1e0 100644 ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_SetVertexShaderConstantF(device, consts_swvp - 1, c, 1); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); -@@ -7010,7 +7006,6 @@ static void test_vertex_shader_constant(void) +@@ -7012,7 +7008,6 @@ static void test_vertex_shader_constant(void) IDirect3DDevice9_SetSoftwareVertexProcessing(device, 1); hr = IDirect3DDevice9_SetVertexShaderConstantF(device, consts + 0, c, 1); @@ -49,10 +49,10 @@ index 5c4417a2568..21bd83fc1e0 100644 hr = IDirect3DDevice9_SetVertexShaderConstantF(device, consts_swvp - 1, c, 1); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c -index d1bcaf39c14..290e37728f9 100644 +index 230f7deabb2..6a62cddcb06 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c -@@ -25184,7 +25184,6 @@ static void test_mvp_software_vertex_shaders(void) +@@ -25199,7 +25199,6 @@ static void test_mvp_software_vertex_shaders(void) hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, c_index, 1); ok(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_SetVertexShaderConstantF(device, (unsigned int)c_index[0], c_color, 1); @@ -61,7 +61,7 @@ index d1bcaf39c14..290e37728f9 100644 hr = IDirect3DDevice9_BeginScene(device); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c -index 0762f90b6a5..f205e95c3b5 100644 +index 8be63df577a..28c8fb09d0d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3922,7 +3922,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, @@ -70,10 +70,10 @@ index 0762f90b6a5..f205e95c3b5 100644 struct wined3d_device_context *context = &device->cs->c; - unsigned int i, j, start, idx; + unsigned int i, j, start, idx, vs_uniform_count; + bool set_depth_bounds = false; struct wined3d_range range; uint32_t map; - -@@ -3933,9 +3933,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, +@@ -3934,9 +3934,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if (changed->pixelShader) wined3d_device_context_set_shader(context, WINED3D_SHADER_TYPE_PIXEL, state->ps); @@ -184,10 +184,10 @@ index 16f58b726d0..f0ad28d37a0 100644 default: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h -index d0f7600171a..c4ac93c2d58 100644 +index 27811745370..2772c130bc7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h -@@ -3891,7 +3891,7 @@ struct wined3d_state +@@ -3906,7 +3906,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]; @@ -196,7 +196,7 @@ index d0f7600171a..c4ac93c2d58 100644 struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I]; BOOL vs_consts_b[WINED3D_MAX_CONSTS_B]; -@@ -4073,6 +4073,15 @@ static inline void wined3d_device_bo_map_unlock(struct wined3d_device *device) +@@ -4090,6 +4090,15 @@ static inline void wined3d_device_bo_map_unlock(struct wined3d_device *device) LeaveCriticalSection(&device->bo_map_lock); } @@ -212,7 +212,7 @@ index d0f7600171a..c4ac93c2d58 100644 struct wined3d_device_no3d { struct wined3d_device d; -@@ -4961,7 +4970,7 @@ struct wined3d_vertex_declaration +@@ -4978,7 +4987,7 @@ struct wined3d_vertex_declaration struct wined3d_saved_states { @@ -235,5 +235,5 @@ index 0ce807fc5c8..ba8e8759a58 100644 BOOL vs_consts_b[WINED3D_MAX_CONSTS_B]; -- -2.38.1 +2.39.1 diff --git a/staging/upstream-commit b/staging/upstream-commit index aa1653e4..1e5f8887 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -a4ed65d57721adade08440b9cabf44e3394fc3ad +a958b5aebfeed4538a4091f49996ae30ee9803fc