winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2020
----- 2025 -----
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
851 discussions
Start a n
N
ew thread
Biswapriyo Nath : include: Add D3D11_FEATURE_DATA_D3D11_OPTIONS5 structure in d3d11.idl.
by Alexandre Julliard
26 Nov '20
26 Nov '20
Module: wine Branch: master Commit: c4b65b6f1ec674072e75f515b20de0895b9405fb URL:
https://source.winehq.org/git/wine.git/?a=commit;h=c4b65b6f1ec674072e75f515…
Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Nov 26 01:04:28 2020 +0530 include: Add D3D11_FEATURE_DATA_D3D11_OPTIONS5 structure in d3d11.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.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 80a65c9ae16..3613238d722 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -657,6 +657,7 @@ typedef enum D3D11_FEATURE D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT, D3D11_FEATURE_D3D11_OPTIONS4, D3D11_FEATURE_SHADER_CACHE, + D3D11_FEATURE_D3D11_OPTIONS5, } D3D11_FEATURE; typedef struct D3D11_FEATURE_DATA_THREADING @@ -809,6 +810,19 @@ typedef struct D3D11_FEATURE_DATA_SHADER_CACHE UINT SupportFlags; } D3D11_FEATURE_DATA_SHADER_CACHE; +typedef enum D3D11_SHARED_RESOURCE_TIER +{ + D3D11_SHARED_RESOURCE_TIER_0, + D3D11_SHARED_RESOURCE_TIER_1, + D3D11_SHARED_RESOURCE_TIER_2, + D3D11_SHARED_RESOURCE_TIER_3, +} D3D11_SHARED_RESOURCE_TIER; + +typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS5 +{ + D3D11_SHARED_RESOURCE_TIER SharedResourceTier; +} D3D11_FEATURE_DATA_D3D11_OPTIONS5; + typedef enum D3D11_FILL_MODE { D3D11_FILL_WIREFRAME = 2,
1
0
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
0
Rémi Bernon : gdi32: Compare font face names using RtlDowncaseUnicodeChar.
by Alexandre Julliard
26 Nov '20
26 Nov '20
Module: wine Branch: master Commit: c06cacff1127b3903f982389b97e7a7ffa82fb17 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=c06cacff1127b3903f982389…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 23 13:20:50 2020 +0100 gdi32: Compare font face names using RtlDowncaseUnicodeChar. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 68 +++++++++++++++++++++++++++++++------------------ dlls/gdi32/tests/font.c | 2 +- 2 files changed, 44 insertions(+), 26 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=c06cacff1127b3903f98…
1
0
0
0
Rémi Bernon : gdi32/tests: Add locale-dependent face matching test.
by Alexandre Julliard
26 Nov '20
26 Nov '20
Module: wine Branch: master Commit: c57a53147f4c86ec37e1abc05ff171114a224771 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=c57a53147f4c86ec37e1abc0…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 23 13:20:49 2020 +0100 gdi32/tests: Add locale-dependent face matching test. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 19 ++++++++++++++----- dlls/gdi32/tests/wine_langnames3.sfd | 4 ++-- dlls/gdi32/tests/wine_langnames3.ttf | Bin 2048 -> 2076 bytes 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 94910ff60fc..2988ab45ea7 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7269,12 +7269,21 @@ static void test_lang_names(void) /* either because it's the primary language, or because it's a secondary */ ok( efnd.total == min( 2, i + 1 ), "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); - strcpy( font.lfFaceName, "Wine Lang Cond (fr)" ); - memset( &efnd, 0, sizeof(efnd) ); - EnumFontFamiliesExA( dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0 ); + wcscpy( font_w.lfFaceName, L"Wine Police d'\xe9" "criture (fr)" ); + memset( &efnd_w, 0, sizeof(efnd_w) ); + EnumFontFamiliesExW( dc, &font_w, enum_fullname_data_proc_w, (LPARAM)&efnd_w, 0 ); /* as wine_langnames3.sfd does not specify (en) name, (fr) is preferred */ - if (i == 2) ok( efnd.total == 1, "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); - else ok( efnd.total == 0, "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); + if (i == 2) ok( efnd_w.total == 1, "%d: EnumFontFamiliesExW unexpected count %u.\n", i, efnd_w.total ); + else ok( efnd_w.total == 0, "%d: EnumFontFamiliesExW unexpected count %u.\n", i, efnd_w.total ); + + /* case matching should not depend on the current locale */ + if (i == 2) + { + wcscpy( font_w.lfFaceName, L"Wine POLICE D'\xc9" "CRITURE (fr)" ); + memset( &efnd_w, 0, sizeof(efnd_w) ); + EnumFontFamiliesExW( dc, &font_w, enum_fullname_data_proc_w, (LPARAM)&efnd_w, 0 ); + todo_wine ok( efnd_w.total == 1, "%d: EnumFontFamiliesExW unexpected count %u.\n", i, efnd_w.total ); + } strcpy( font.lfFaceName, "Wine Lang Cond (ko)" ); memset( &efnd, 0, sizeof(efnd) ); diff --git a/dlls/gdi32/tests/wine_langnames3.sfd b/dlls/gdi32/tests/wine_langnames3.sfd index ea0dbff57d9..55536fa58c1 100644 --- a/dlls/gdi32/tests/wine_langnames3.sfd +++ b/dlls/gdi32/tests/wine_langnames3.sfd @@ -39,8 +39,8 @@ MarkAttachClasses: 1 DEI: 91125 LangName: 1036 \ "" \ - "Wine Lang Cond (fr)" \ - "Reg (fr)" \ + "Wine Police d'+AOkA-criture (fr)" \ + "R+AOkA-guli+AOgA-re (fr)" \ "" \ "Wine Lang Cond Reg (fr)" LangName: 1042 \ diff --git a/dlls/gdi32/tests/wine_langnames3.ttf b/dlls/gdi32/tests/wine_langnames3.ttf index dd76bd478bb..408d127fb1e 100644 Binary files a/dlls/gdi32/tests/wine_langnames3.ttf and b/dlls/gdi32/tests/wine_langnames3.ttf differ
1
0
0
0
← Newer
1
...
12
13
14
15
16
17
18
...
86
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
Results per page:
10
25
50
100
200