November 2020 - Wine-commits

Alexandre Julliard : configure: Also disable format warnings for ARM64.
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: ecf00292db7844eb4191222ed01a5106e2462971 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecf00292db7844eb4191222e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 17:03:49 2020 +0100 configure: Also disable format warnings for ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 31 +++++++++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 32 insertions(+) diff --git a/configure b/configure index 94d93313949..e6596361ff1 100755 --- a/configure +++ b/configure @@ -10460,6 +10460,37 @@ fi $as_echo "$ac_cv_crosscflags__mcx16" >&6; } if test "x$ac_cv_crosscflags__mcx16" = xyes; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -mcx16" +fi ;; + aarch64) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Wno-format" >&5 +$as_echo_n "checking whether the cross-compiler supports -Wno-format... " >&6; } +if ${ac_cv_crosscflags__Wno_format+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_cc=$CC +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -Wno-format" +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_crosscflags__Wno_format=yes +else + ac_cv_crosscflags__Wno_format=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +CC=$ac_wine_try_cflags_saved_cc +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__Wno_format" >&5 +$as_echo "$ac_cv_crosscflags__Wno_format" >&6; } +if test "x$ac_cv_crosscflags__Wno_format" = xyes; then : + EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wno-format" fi ;; esac diff --git a/configure.ac b/configure.ac index c7eab5c086f..705ab04295d 100644 --- a/configure.ac +++ b/configure.ac @@ -1072,6 +1072,7 @@ then WINE_TRY_CROSSCFLAGS([-Wformat-overflow]) WINE_TRY_CROSSCFLAGS([-Wnonnull]) WINE_TRY_CROSSCFLAGS([-mcx16]) ;; + aarch64) WINE_TRY_CROSSCFLAGS([-Wno-format]) ;; esac dnl Determine debug info format

1 0

Alexandre Julliard : msvcrt: Fix floating-point status register size on ARM64.
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: 3bf2e5230afc36d071614a76641832ea8dd94146 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bf2e5230afc36d071614a76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 17:11:47 2020 +0100 msvcrt: Fix floating-point status register size on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b975fd8d192..dd00cc212c6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1681,7 +1681,7 @@ unsigned int CDECL _statusfp(void) /* FIXME: there's no definition for ambiguous status, just return all status bits for now */ flags = x86_sw | sse2_sw; #elif defined(__aarch64__) - unsigned long fpsr; + ULONG_PTR fpsr; __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); if (fpsr & 0x1) flags |= MSVCRT__SW_INVALID; @@ -1726,7 +1726,7 @@ unsigned int CDECL _clearfp(void) __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); } #elif defined(__aarch64__) - unsigned long fpsr; + ULONG_PTR fpsr; __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); if (fpsr & 0x1) flags |= MSVCRT__SW_INVALID; @@ -1991,7 +1991,7 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) __asm__ __volatile__( "ldmxcsr %0" :: "m" (fpword) ); } #elif defined(__aarch64__) - unsigned long fpcr; + ULONG_PTR fpcr; __asm__ __volatile__( "mrs %0, fpcr" : "=r" (fpcr) ); if (!(fpcr & 0x100)) flags |= MSVCRT__EM_INVALID;

1 0

Alexandre Julliard : kernel32/tests: Fix floating-point status register size on ARM64.
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: c36f580cc49c2acb2f86b6d321d3aa88342ae68d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c36f580cc49c2acb2f86b6d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 23:16:41 2020 +0100 kernel32/tests: Fix floating-point status register size on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index a6c923dc063..b69f69fadaa 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1840,7 +1840,7 @@ static inline unsigned long get_fpu_cw(void) #endif return MAKELONG( cw, sse ); #elif defined(__aarch64__) - unsigned long cw; + ULONG_PTR cw; __asm__ __volatile__( "mrs %0, fpcr" : "=r" (cw) ); return cw; #else

1 0

Matteo Bruni : wined3d: Ignore WINED3DFMT_NULL rendertarget in D/S size checks.
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: 7b23056c0b90fee948b34702640101f051128beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b23056c0b90fee948b34702… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Nov 25 18:11:26 2020 +0100 wined3d: Ignore WINED3DFMT_NULL rendertarget in D/S size checks. 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/context_gl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 73d520e5709..1f9003ed16e 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -627,7 +627,8 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex struct fbo_entry *entry; if (depth_stencil->resource && depth_stencil->resource->type != WINED3D_RTYPE_BUFFER - && render_targets[0].resource && render_targets[0].resource->type != WINED3D_RTYPE_BUFFER) + && render_targets[0].resource && render_targets[0].resource->type != WINED3D_RTYPE_BUFFER + && render_targets[0].resource->format->id != WINED3DFMT_NULL) { rt_texture = wined3d_texture_from_resource(render_targets[0].resource); rt_level = render_targets[0].sub_resource_idx % rt_texture->level_count;

1 0

Matteo Bruni : d3d9/tests: Use get_readback_color() in test_null_format().
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: 065d16a766176b473f9653f9664175aa303f8d41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=065d16a766176b473f9653f9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Nov 25 18:11:27 2020 +0100 d3d9/tests: Use get_readback_color() in test_null_format(). 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/d3d9/tests/visual.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5218d8a2029..efd8d701885 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -24986,6 +24986,7 @@ static void test_null_format(void) {600, 320, 0x0000ff00}, }; IDirect3DSurface9 *original_rt, *small_rt, *null_rt, *small_null_rt; + struct surface_readback rb; IDirect3DDevice9 *device; IDirect3D9 *d3d; unsigned int i; @@ -25101,13 +25102,15 @@ static void test_null_format(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + get_rt_readback(original_rt, &rb); for (i = 0; i < ARRAY_SIZE(expected_colors); ++i) { - color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); } + release_surface_readback(&rb); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr);

1 0

Matteo Bruni : d3d9/tests: Test using a "NULL" texture with a smaller D/S texture.
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: 967227958d3c3565413899f19b1f1997539a2742 URL: https://source.winehq.org/git/wine.git/?a=commit;h=967227958d3c3565413899f1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Nov 25 18:11:28 2020 +0100 d3d9/tests: Test using a "NULL" texture with a smaller D/S texture. 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/d3d9/tests/visual.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index efd8d701885..7c0a0157389 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -24931,6 +24931,7 @@ done: static void test_null_format(void) { + static const D3DVIEWPORT9 vp_part_400 = {0, 100, 400, 200, 0.0f, 1.0f}; static const D3DVIEWPORT9 vp_lower = {0, 60, 640, 420, 0.0f, 1.0f}; static const D3DVIEWPORT9 vp_560 = {0, 180, 560, 300, 0.0f, 1.0f}; static const D3DVIEWPORT9 vp_full = {0, 0, 640, 480, 0.0f, 1.0f}; @@ -24984,8 +24985,21 @@ static void test_null_format(void) {440, 320, 0x000000ff}, {520, 320, 0x00000000}, {600, 320, 0x0000ff00}, + }, + expected_small[] = + { + {100, 100, 0x00ff0000}, + {200, 100, 0x00ff0000}, + {300, 100, 0x00ff0000}, + {100, 150, 0x00000000}, + {200, 150, 0x00000000}, + {300, 150, 0x00ff0000}, + {100, 200, 0x00000000}, + {200, 200, 0x00000000}, + {300, 200, 0x00ff0000}, }; IDirect3DSurface9 *original_rt, *small_rt, *null_rt, *small_null_rt; + IDirect3DSurface9 *original_ds, *small_ds; struct surface_readback rb; IDirect3DDevice9 *device; IDirect3D9 *d3d; @@ -25027,6 +25041,12 @@ static void test_null_format(void) D3DMULTISAMPLE_NONE, 0, FALSE, &small_null_rt, NULL); ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &original_ds); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 400, 300, D3DFMT_D24S8, 0, 0, FALSE, + &small_ds, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); @@ -25112,9 +25132,54 @@ static void test_null_format(void) } release_surface_readback(&rb); + /* Clears and draws on a depth buffer smaller than the "NULL" RT work just + * fine. */ + hr = IDirect3DDevice9_SetRenderTarget(device, 0, null_rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, small_ds); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetViewport(device, &vp_full); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.6f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetViewport(device, &vp_part_400); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad_partial, sizeof(*quad_partial)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, small_rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + get_rt_readback(small_rt, &rb); + for (i = 0; i < ARRAY_SIZE(expected_small); ++i) + { + color = get_readback_color(&rb, expected_small[i].x, expected_small[i].y); + ok(color_match(color, expected_small[i].color, 1), + "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", + expected_small[i].color, expected_small[i].x, expected_small[i].y, color); + } + release_surface_readback(&rb); + + hr = IDirect3DDevice9_StretchRect(device, small_rt, NULL, original_rt, NULL, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + IDirect3DSurface9_Release(small_ds); + IDirect3DSurface9_Release(original_ds); IDirect3DSurface9_Release(small_null_rt); IDirect3DSurface9_Release(null_rt); IDirect3DSurface9_Release(small_rt);

1 0

Matteo Bruni : wined3d: Use glClearDepthf() when available.
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: 881e0a4310e5c9caf258ea9b45e70a0c948dfc77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=881e0a4310e5c9caf258ea9b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Nov 25 18:11:29 2020 +0100 wined3d: Use glClearDepthf() when available. 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/texture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2f42a41754f..41e4415f13f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5398,7 +5398,10 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig { gl_info->gl_ops.gl.p_glDepthMask(GL_TRUE); context_invalidate_state(context, STATE_DEPTH_STENCIL); - gl_info->gl_ops.gl.p_glClearDepth(depth); + if (gl_info->supported[ARB_ES2_COMPATIBILITY]) + GL_EXTCALL(glClearDepthf(depth)); + else + gl_info->gl_ops.gl.p_glClearDepth(depth); checkGLcall("glClearDepth"); clear_mask = clear_mask | GL_DEPTH_BUFFER_BIT; }

1 0

Matteo Bruni : wined3d: Add a trace to wined3d_context_gl_bind_fbo().
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: 22c633465652ba9c949dfc9d31d74f02a92d1378 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22c633465652ba9c949dfc9d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Nov 25 18:11:30 2020 +0100 wined3d: Add a trace to wined3d_context_gl_bind_fbo(). 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/context_gl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 1f9003ed16e..f2b5e8697b6 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -91,6 +91,8 @@ static void wined3d_context_gl_bind_fbo(struct wined3d_context_gl *context_gl, G { const struct wined3d_gl_info *gl_info = context_gl->gl_info; + TRACE("context_gl %p, target %#x, fbo %u.\n", context_gl, target, fbo); + switch (target) { case GL_READ_FRAMEBUFFER:

1 0

Biswapriyo Nath : include: Add D3D10_RAISE_FLAG structure in d3d10.idl.
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: 2736a82c73001351749faa217baf42bdec75a4bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2736a82c73001351749faa21… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Nov 25 22:26:25 2020 +0530 include: Add D3D10_RAISE_FLAG structure in d3d10.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d10.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/d3d10.idl b/include/d3d10.idl index 146332ac1cd..c35e44a0d92 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -891,6 +891,10 @@ typedef enum D3D10_MAP_FLAG { D3D10_MAP_FLAG_DO_NOT_WAIT = 0x100000, } D3D10_MAP_FLAG; +typedef enum D3D10_RAISE_FLAG { + D3D10_RAISE_FLAG_DRIVER_INTERNAL_ERROR = 0x1, +} D3D10_RAISE_FLAG; + typedef enum D3D10_CLEAR_FLAG { D3D10_CLEAR_DEPTH = 0x1, D3D10_CLEAR_STENCIL = 0x2

1 0

Biswapriyo Nath : include: Add D3D11_FENCE_FLAG_NON_MONITORED name in d3d11_3.idl.
by Alexandre Julliard 26 Nov '20

26 Nov '20

Module: wine Branch: master Commit: 317adb8705a0907a5721d57a87f21094eb2bce6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=317adb8705a0907a5721d57a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Nov 25 22:27:24 2020 +0530 include: Add D3D11_FENCE_FLAG_NON_MONITORED name in d3d11_3.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11_3.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/d3d11_3.idl b/include/d3d11_3.idl index 4f9ea797416..f188a37e34f 100644 --- a/include/d3d11_3.idl +++ b/include/d3d11_3.idl @@ -49,6 +49,7 @@ typedef enum D3D11_FENCE_FLAG D3D11_FENCE_FLAG_NONE = 0x1, D3D11_FENCE_FLAG_SHARED = 0x2, D3D11_FENCE_FLAG_SHARED_CROSS_ADAPTER = 0x4, + D3D11_FENCE_FLAG_NON_MONITORED = 0x8, } D3D11_FENCE_FLAG; typedef struct D3D11_TEXTURE2D_DESC1

1 0