November 2021 - Wine-commits

Alexandre Julliard : winmm: Command resources should not depend on pointer size.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: acecec4a2e4b77cc05b0355a799af20fbdc6ec49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acecec4a2e4b77cc05b0355a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 22 16:09:42 2021 +0100 winmm: Command resources should not depend on pointer size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52072 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/mciavi_res.rc | 6 +----- dlls/mciqtz32/mciavi_res.rc | 6 +----- dlls/winmm/mci.c | 8 ++------ dlls/winmm/winmm_res.rc | 6 +----- 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/dlls/mciavi32/mciavi_res.rc b/dlls/mciavi32/mciavi_res.rc index e2e4caa805c..0aae615d13a 100644 --- a/dlls/mciavi32/mciavi_res.rc +++ b/dlls/mciavi32/mciavi_res.rc @@ -22,11 +22,7 @@ #include "mmddk.h" #include "digitalv.h" -#ifdef MCI_INTEGER64 -#define MCI_DWORD_PTR MCI_INTEGER64 -#else -#define MCI_DWORD_PTR MCI_INTEGER -#endif +#define MCI_DWORD_PTR 13 /* MCI_INTEGER64 */ MCIAVI RCDATA BEGIN diff --git a/dlls/mciqtz32/mciavi_res.rc b/dlls/mciqtz32/mciavi_res.rc index e2e4caa805c..0aae615d13a 100644 --- a/dlls/mciqtz32/mciavi_res.rc +++ b/dlls/mciqtz32/mciavi_res.rc @@ -22,11 +22,7 @@ #include "mmddk.h" #include "digitalv.h" -#ifdef MCI_INTEGER64 -#define MCI_DWORD_PTR MCI_INTEGER64 -#else -#define MCI_DWORD_PTR MCI_INTEGER -#endif +#define MCI_DWORD_PTR 13 /* MCI_INTEGER64 */ MCIAVI RCDATA BEGIN diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index c19ab453290..8e43dcc0f62 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1228,8 +1228,7 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret } break; } -#ifdef MCI_INTEGER64 - case MCI_INTEGER64: + case 13: /* MCI_INTEGER64 */ { DWORD_PTR data = *(DWORD_PTR *)(params + 1); switch (dwRet & 0xFFFF0000ul) { @@ -1263,7 +1262,6 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret } break; } -#endif case MCI_STRING: switch (dwRet & 0xFFFF0000ul) { case 0: @@ -1484,11 +1482,9 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, case MCI_RECT: offset += 4 * sizeof(DWORD); break; -#ifdef MCI_INTEGER64 - case MCI_INTEGER64: + case 13: /* MCI_INTEGER64 */ offset += sizeof(DWORD_PTR); break; -#endif default: FIXME("Unknown MCI return type %d\n", retType); dwRet = MCIERR_PARSER_INTERNAL; diff --git a/dlls/winmm/winmm_res.rc b/dlls/winmm/winmm_res.rc index 64c42b42ea0..a365446a46f 100644 --- a/dlls/winmm/winmm_res.rc +++ b/dlls/winmm/winmm_res.rc @@ -25,11 +25,7 @@ #include "windef.h" #include "mmddk.h" -#ifdef MCI_INTEGER64 -#define MCI_DWORD_PTR MCI_INTEGER64 -#else -#define MCI_DWORD_PTR MCI_INTEGER -#endif +#define MCI_DWORD_PTR 13 /* MCI_INTEGER64 */ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Alexandre Julliard : ntdll/tests: Fix a test failure on older Windows versions.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 0907d8cc6d94b5c5707830a9b637ec7a645d53da URL: https://source.winehq.org/git/wine.git/?a=commit;h=0907d8cc6d94b5c5707830a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 22 22:19:57 2021 +0100 ntdll/tests: Fix a test failure on older Windows versions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52069 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 53adee5896d..adc9b1ae6dc 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -245,7 +245,7 @@ static void test_NtAllocateVirtualMemory(void) addr2 = (char *)addr1 + 0xffe; status = NtFreeVirtualMemory(NtCurrentProcess(), &addr2, &size, MEM_DECOMMIT); ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory failed %x\n", status); - ok( size == 0, "wrong size %lx\n", size ); + ok( size == 0 || broken(size == 0x10000) /* <= win10 1709 */, "wrong size %lx\n", size ); ok( addr2 == addr1, "wrong addr %p\n", addr2 ); size = 0;

1 0

Matteo Bruni : d3dx9/tests: Clean up GetMatrixTransposePointerArray() tests.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 71c6f5b1ca3f2528aabedf216e525c4526a3c337 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71c6f5b1ca3f2528aabedf21… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 19 20:50:26 2021 +0100 d3dx9/tests: Clean up GetMatrixTransposePointerArray() tests. Inspired by a patch from Eric Pouech <eric.pouech(a)gmail.com>. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index a13dc708726..ea90299f936 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1475,16 +1475,16 @@ static void test_effect_parameter_value_GetMatrixPointerArray(const struct test_ float f[sizeof(D3DXMATRIX) / sizeof(float)]; D3DXMATRIX m; } fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE * sizeof(float) / sizeof(D3DXMATRIX)]; + D3DXMATRIX *matrix_pointer_array[ARRAY_SIZE(fvalue)]; const D3DXPARAMETER_DESC *res_desc = &res->desc; const char *res_full_name = res->full_name; - HRESULT hr; - D3DXMATRIX *matrix_pointer_array[ARRAY_SIZE(fvalue)]; UINT l, k, m, element, err = 0; union { DWORD d; float f; } cmp = {0xabababab}; + HRESULT hr; for (element = 0; element <= res_desc->Elements + 1; ++element) { @@ -1670,20 +1670,28 @@ static void test_effect_parameter_value_GetMatrixTransposeArray(const struct tes static void test_effect_parameter_value_GetMatrixTransposePointerArray(const struct test_effect_parameter_value_result *res, ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) { + union + { + float f[sizeof(D3DXMATRIX) / sizeof(float)]; + D3DXMATRIX m; + } fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE * sizeof(float) / sizeof(D3DXMATRIX)]; + D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)]; const D3DXPARAMETER_DESC *res_desc = &res->desc; const char *res_full_name = res->full_name; - HRESULT hr; - DWORD cmp = 0xabababab; - FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; - D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/sizeof(D3DXMATRIX)]; UINT l, k, m, element, err = 0; + union + { + DWORD d; + float f; + } cmp = {0xabababab}; + HRESULT hr; for (element = 0; element <= res_desc->Elements + 1; ++element) { memset(fvalue, 0xab, sizeof(fvalue)); for (l = 0; l < element; ++l) { - matrix_pointer_array[l] = (D3DXMATRIX *)&fvalue[l * sizeof(**matrix_pointer_array) / sizeof(FLOAT)]; + matrix_pointer_array[l] = &fvalue[l].m; } hr = effect->lpVtbl->GetMatrixTransposePointerArray(effect, parameter, matrix_pointer_array, element); if (!element) @@ -1691,7 +1699,10 @@ static void test_effect_parameter_value_GetMatrixTransposePointerArray(const str ok(hr == D3D_OK, "%u - %s[%u]: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", i, res_full_name, element, hr, D3D_OK); - for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = 0; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[m].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; } else if (element <= res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) { @@ -1706,23 +1717,30 @@ static void test_effect_parameter_value_GetMatrixTransposePointerArray(const str { if (k < res_desc->Columns && l < res_desc->Rows) { - if (!compare_float(fvalue[m * 16 + l + k * 4], get_float(res_desc->Type, + if (!compare_float(fvalue[m].m.m[k][l], get_float(res_desc->Type, &res_value[m * res_desc->Columns * res_desc->Rows + l * res_desc->Columns + k]), 512)) ++err; } - else if (fvalue[m * 16 + l + k * 4] != 0.0f) ++err; + else if (fvalue[m].m.m[k][l] != 0.0f) + ++err; } } } - for (l = element * 16; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = element; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[m].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; } else { ok(hr == D3DERR_INVALIDCALL, "%u - %s[%u]: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", i, res_full_name, element, hr, D3DERR_INVALIDCALL); - for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = 0; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[m].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; } ok(!err, "%u - %s[%u]: GetMatrixTransposePointerArray failed with %u errors\n", i, res_full_name, element, err); }

1 0

Matteo Bruni : d3dx9/tests: Clean up test_update_semantics() a bit.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: cee2d4c4c90887faa862f5d0dfc61e16312e9799 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cee2d4c4c90887faa862f5d0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 19 20:50:27 2021 +0100 d3dx9/tests: Clean up test_update_semantics() a bit. Inspired by a patch from Eric Pouech <eric.pouech(a)gmail.com>. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 829e4ee0ff9..3274b2d38bc 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4739,11 +4739,9 @@ static void test_update_semantics(void) D3DVERTEXELEMENT9 *decl_ptr; DWORD exp_vertex_size = sizeof(*vertices); DWORD vertex_size = 0; + BYTE *decl_mem; int equal; int i = 0; - int *decl_mem; - int filler_a = 0xaaaaaaaa; - int filler_b = 0xbbbbbbbb; test_context = new_test_context(); if (!test_context) @@ -4815,22 +4813,20 @@ static void test_update_semantics(void) /* Check that GetDeclaration only writes up to the D3DDECL_END() marker and * not the full MAX_FVF_DECL_SIZE elements. */ - memset(declaration, filler_a, sizeof(declaration)); + memset(declaration, 0xaa, sizeof(declaration)); memcpy(declaration, declaration0, sizeof(declaration0)); hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration); ok(hr == D3D_OK, "Test UpdateSemantics, " "got %#x expected D3D_OK\n", hr); - memset(declaration, filler_b, sizeof(declaration)); + memset(declaration, 0xbb, sizeof(declaration)); hr = mesh->lpVtbl->GetDeclaration(mesh, declaration); ok(hr == D3D_OK, "Couldn't get vertex declaration. Got %#x, expected D3D_OK\n", hr); - decl_mem = (int*)declaration; - for (i = sizeof(declaration0)/sizeof(*decl_mem); i < sizeof(declaration)/sizeof(*decl_mem); i++) - { - equal = memcmp(&decl_mem[i], &filler_b, sizeof(filler_b)); - ok(equal == 0, - "GetDeclaration wrote past the D3DDECL_END() marker. " - "Got %#x, expected %#x\n", decl_mem[i], filler_b); - if (equal != 0) break; + decl_mem = (BYTE *)declaration; + for (i = sizeof(declaration0); i < sizeof(declaration); ++i) + { + ok(decl_mem[i] == 0xbb, "Unexpected %#x.\n", decl_mem[i]); + if (equal != 0) + break; } /* UpdateSemantics does not check for overlapping fields */

1 0

Matteo Bruni : Revert "ntdll: Implement NtYieldExecution() as usleep().".
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 3203f056687f62e3d74604da0efb6183989dfab4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3203f056687f62e3d74604da… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 19 20:50:28 2021 +0100 Revert "ntdll: Implement NtYieldExecution() as usleep().". Rémi found a regression caused by that patch. His analysis suggests that it's probably correct for NtYieldExecution() to map to sched_yield(). Let's revert the patch and fix the issue in a slightly different way. This reverts commit b1a79c6b9c3ada0c34b1411b60879962f1815e4d. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 10 ++++++++-- configure.ac | 3 ++- dlls/ntdll/unix/sync.c | 6 +++++- include/config.h.in | 3 +++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 7b215627241..ae5c8e2734e 100755 --- a/configure +++ b/configure @@ -1512,7 +1512,6 @@ enable_msv1_0 enable_msvcirt enable_msvcm80 enable_msvcm90 -enable_msvcp_win enable_msvcp100 enable_msvcp110 enable_msvcp120 @@ -1524,6 +1523,7 @@ enable_msvcp70 enable_msvcp71 enable_msvcp80 enable_msvcp90 +enable_msvcp_win enable_msvcr100 enable_msvcr110 enable_msvcr120 @@ -19085,6 +19085,12 @@ if test "x$ac_cv_func_proc_pidinfo" = xyes then : printf "%s\n" "#define HAVE_PROC_PIDINFO 1" >>confdefs.h +fi +ac_fn_c_check_func "$LINENO" "sched_yield" "ac_cv_func_sched_yield" +if test "x$ac_cv_func_sched_yield" = xyes +then : + printf "%s\n" "#define HAVE_SCHED_YIELD 1" >>confdefs.h + fi ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle" if test "x$ac_cv_func_setproctitle" = xyes @@ -21595,7 +21601,6 @@ wine_fn_config_makefile dlls/msvcirt enable_msvcirt wine_fn_config_makefile dlls/msvcirt/tests enable_tests wine_fn_config_makefile dlls/msvcm80 enable_msvcm80 wine_fn_config_makefile dlls/msvcm90 enable_msvcm90 -wine_fn_config_makefile dlls/msvcp_win enable_msvcp_win wine_fn_config_makefile dlls/msvcp100 enable_msvcp100 wine_fn_config_makefile dlls/msvcp100/tests enable_tests wine_fn_config_makefile dlls/msvcp110 enable_msvcp110 @@ -21614,6 +21619,7 @@ wine_fn_config_makefile dlls/msvcp71 enable_msvcp71 wine_fn_config_makefile dlls/msvcp80 enable_msvcp80 wine_fn_config_makefile dlls/msvcp90 enable_msvcp90 wine_fn_config_makefile dlls/msvcp90/tests enable_tests +wine_fn_config_makefile dlls/msvcp_win enable_msvcp_win wine_fn_config_makefile dlls/msvcr100 enable_msvcr100 wine_fn_config_makefile dlls/msvcr100/tests enable_tests wine_fn_config_makefile dlls/msvcr110 enable_msvcr110 diff --git a/configure.ac b/configure.ac index 5074ee14833..9c0c8d25d29 100644 --- a/configure.ac +++ b/configure.ac @@ -1948,6 +1948,7 @@ AC_CHECK_FUNCS(\ posix_fallocate \ prctl \ proc_pidinfo \ + sched_yield \ setproctitle \ setprogname \ sigprocmask \ @@ -3133,7 +3134,6 @@ WINE_CONFIG_MAKEFILE(dlls/msvcirt) WINE_CONFIG_MAKEFILE(dlls/msvcirt/tests) WINE_CONFIG_MAKEFILE(dlls/msvcm80) WINE_CONFIG_MAKEFILE(dlls/msvcm90) -WINE_CONFIG_MAKEFILE(dlls/msvcp_win) WINE_CONFIG_MAKEFILE(dlls/msvcp100) WINE_CONFIG_MAKEFILE(dlls/msvcp100/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp110) @@ -3152,6 +3152,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp71) WINE_CONFIG_MAKEFILE(dlls/msvcp80) WINE_CONFIG_MAKEFILE(dlls/msvcp90) WINE_CONFIG_MAKEFILE(dlls/msvcp90/tests) +WINE_CONFIG_MAKEFILE(dlls/msvcp_win) WINE_CONFIG_MAKEFILE(dlls/msvcr100) WINE_CONFIG_MAKEFILE(dlls/msvcr100/tests) WINE_CONFIG_MAKEFILE(dlls/msvcr110) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 7f71b737045..829add0be2d 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1447,8 +1447,12 @@ NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE signal, HANDLE wait, */ NTSTATUS WINAPI NtYieldExecution(void) { - usleep(0); +#ifdef HAVE_SCHED_YIELD + sched_yield(); return STATUS_SUCCESS; +#else + return STATUS_NO_YIELD_PERFORMED; +#endif } diff --git a/include/config.h.in b/include/config.h.in index 0c843a0423c..0fe50e8ce7c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -443,6 +443,9 @@ /* Define to 1 if you have the `sched_setaffinity' function. */ #undef HAVE_SCHED_SETAFFINITY +/* Define to 1 if you have the `sched_yield' function. */ +#undef HAVE_SCHED_YIELD + /* Define to 1 if `cmd' is a member of `scsireq_t'. */ #undef HAVE_SCSIREQ_T_CMD

1 0

Matteo Bruni : ntdll: Call usleep() instead of NtYieldExecution() in NtDelayExecution().
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: e86b4015ff405d4c054b8a5bc855ee655e1a833c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e86b4015ff405d4c054b8a5b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 19 20:50:29 2021 +0100 ntdll: Call usleep() instead of NtYieldExecution() in NtDelayExecution(). This implements the general fix from b1a79c6b9c3ada0c34b1411b60879962f1815e4d (in particular, making sure that Sleep(0) will not immediately resume execution of the thread if there are no other runnable threads) while preserving the existing behavior of NtYieldExecution() / SwitchToThread(). Thanks Rémi for the idea. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 829add0be2d..d5d92145503 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1480,7 +1480,7 @@ NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeou } /* Note that we yield after establishing the desired timeout */ - NtYieldExecution(); + usleep(0); if (!when) return STATUS_SUCCESS; for (;;)

1 0

Matteo Bruni : wined3d: Declare gl_Position as invariant.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 884b7c50cfd902eff9a41562a103e3bd5747422b URL: https://source.winehq.org/git/wine.git/?a=commit;h=884b7c50cfd902eff9a41562… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 19 20:50:30 2021 +0100 wined3d: Declare gl_Position as invariant. All D3D versions seem to basically guarantee invariance for the vertex position at the very least. In practice, desktop GL implementations also do the same. That's not necessarily the case for tile based renderers, where the cost of providing invariance might be non negligible. We want this behavior though, so let's ask for it explicitly. Based on a patch by Stefan Dösinger. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index adfbf60e726..4e51402f1cf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2184,6 +2184,14 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c if (map & 1) shader_addline(buffer, "void subroutine%u();\n", i); } + if (version->type != WINED3D_SHADER_TYPE_PIXEL && version->type != WINED3D_SHADER_TYPE_COMPUTE) + { + if (version->type == WINED3D_SHADER_TYPE_HULL) + shader_addline(buffer, "out gl_PerVertex { invariant vec4 gl_Position; } gl_out[];\n"); + else + shader_addline(buffer, "invariant gl_Position;\n"); + } + /* Declare the constants (aka uniforms) */ if (shader->limits->constant_float > 0) { @@ -7125,6 +7133,8 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl shader_glsl_add_version_declaration(buffer, gl_info); + shader_addline(buffer, "invariant gl_Position;\n"); + if (per_vertex_point_size) { shader_addline(buffer, "uniform struct\n{\n"); @@ -8994,6 +9004,8 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr if (shader_glsl_use_explicit_attrib_location(gl_info)) shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); + shader_addline(buffer, "invariant gl_Position;\n"); + for (i = 0; i < WINED3D_FFP_ATTRIBS_COUNT; ++i) { const char *type = i < ARRAY_SIZE(attrib_info) ? attrib_info[i].type : "vec4";

1 0

Zebediah Figura : wined3d: Move the "buffer_offset" field to struct wined3d_bo.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 5c13b060ca295e00571fe1f657e40be81e9c4776 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c13b060ca295e00571fe1f6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 19 17:23:44 2021 -0600 wined3d: Move the "buffer_offset" field to struct wined3d_bo. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 14 +++++++------- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/context_gl.c | 8 ++++---- dlls/wined3d/context_vk.c | 10 +++++----- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/view.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 3 +-- 9 files changed, 32 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c13b060ca295e00571f…

1 0

Zebediah Figura : wined3d: Respect the BO address offset when uploading data from the CPU in wined3d_texture_gl_download_data_slow_path().
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 0b9a475324f557a6bb918e064bdd482c9aa3a1f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b9a475324f557a6bb918e06… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 19 17:23:45 2021 -0600 wined3d: Respect the BO address offset when uploading data from the CPU in wined3d_texture_gl_download_data_slow_path(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 87ae569b549..d164819a10a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2793,7 +2793,7 @@ static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, bo->id)); checkGLcall("glBindBuffer"); - GL_EXTCALL(glBufferSubData(GL_PIXEL_PACK_BUFFER, 0, sub_resource->size, src_data)); + GL_EXTCALL(glBufferSubData(GL_PIXEL_PACK_BUFFER, (GLintptr)data->addr, sub_resource->size, src_data)); checkGLcall("glBufferSubData"); } else

1 0

Zebediah Figura : wined3d: Allow OpenGL pixel unpack buffer objects to be suballocated from a larger buffer.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 9c9b5768205ec39b588af2be711b60aa2b023516 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c9b5768205ec39b588af2be… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 19 17:23:47 2021 -0600 wined3d: Allow OpenGL pixel unpack buffer objects to be suballocated from a larger buffer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d164819a10a..072092e73be 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2553,14 +2553,17 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, } else { + const uint8_t *offset = bo.addr; + if (bo.buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, wined3d_bo_gl(bo.buffer_object)->id)); checkGLcall("glBindBuffer"); + offset += bo.buffer_object->buffer_offset; } wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, src_slice_pitch, dst_x, - dst_y, dst_z, update_w, update_h, update_d, bo.addr, srgb, dst_texture, gl_info); + dst_y, dst_z, update_w, update_h, update_d, offset, srgb, dst_texture, gl_info); if (bo.buffer_object) {

1 0