June 2021 - Wine-commits - list.winehq.org

Zhiyi Zhang : user32/tests: Do not change adapters to every available modes.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: f8784c6eb07453ca23fa493abd4bf6a979628a7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8784c6eb07453ca23fa493a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 17 15:20:21 2021 +0800 user32/tests: Do not change adapters to every available modes. This reduce the time to run the monitor test from 6 minutes to 25 seconds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50086 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cad102465ddb1151cdac4ec073e734dfaee0d85c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/monitor.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 5e4cc9d154f..a587c7c6b16 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -333,6 +333,7 @@ static void test_ChangeDisplaySettingsEx(void) DISPLAY_DEVICEA dd; POINTL position; DEVMODEW dmW; + BOOL found; LONG res; int i; @@ -732,7 +733,7 @@ static void test_ChangeDisplaySettingsEx(void) ok(count == old_count - 1, "Expect monitor count %d, got %d\n", old_count - 1, count); } - /* Test changing each adapter to every available mode */ + /* Test changing each adapter to different width, height, frequency and depth */ position.x = 0; position.y = 0; for (device = 0; device < device_count; ++device) @@ -741,6 +742,42 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmSize = sizeof(dm); for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm, 0); ++mode) { + if (mode == 0) + { + dm2 = dm; + } + else + { + found = FALSE; + if (dm2.dmPelsWidth && dm.dmPelsWidth != dm2.dmPelsWidth) + { + dm2.dmPelsWidth = 0; + found = TRUE; + } + if (dm2.dmPelsHeight && dm.dmPelsHeight != dm2.dmPelsHeight) + { + dm2.dmPelsHeight = 0; + found = TRUE; + } + if (dm2.dmDisplayFrequency && dm.dmDisplayFrequency != dm2.dmDisplayFrequency) + { + dm2.dmDisplayFrequency = 0; + found = TRUE; + } + if (dm2.dmBitsPerPel && dm.dmBitsPerPel != dm2.dmBitsPerPel) + { + dm2.dmBitsPerPel = 0; + found = TRUE; + } + + if (!dm2.dmPelsWidth && !dm2.dmPelsHeight && !dm2.dmDisplayFrequency + && !dm2.dmBitsPerPel) + break; + + if (!found) + continue; + } + dm.dmPosition = position; dm.dmFields |= DM_POSITION; res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL);

1 0

Michael Stefaniuc : tools: Get the ANNOUNCE bug list from the stable-notes git notes.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 8d5c8f775ea625d9202eb0d17ad411ca0718592c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d5c8f775ea625d9202eb0d1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 26 21:05:28 2017 +0200 tools: Get the ANNOUNCE bug list from the stable-notes git notes. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/make_announce | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/make_announce b/tools/make_announce index 83d869ae69d..b38b7b0a70a 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -24,7 +24,6 @@ use strict; use locale; use POSIX; -use Text::CSV::Encoded; use open ':encoding(utf8)'; sub unescape($) @@ -69,18 +68,14 @@ sub get_current_version() # retrieve a list of bugs with the specified filter sub get_bugs($) { - my $filter = shift; - my $csv = Text::CSV::Encoded->new({ encoding_in => "utf-8", encoding_out => "utf-8" }); my %bugs; - open QUERY, "-|" or exec "wget", "-qO-", "https://bugs.winehq.org/buglist.cgi?columnlist=short_desc&query_format=adva…" + open QUERY, "-|" or exec "git", "log", "--notes=stable-notes", "--format=%N", "wine-" . get_current_version() . ".." or die "cannot query bug list"; - <QUERY>; # skip header line while (<QUERY>) { - next unless $csv->parse($_); - my ($id, $descr) = $csv->fields(); - $bugs{$id} = $descr; + next unless /^Fixes: \[(\d+)\] (.*)/; + $bugs{$1} = $2; } close QUERY; return %bugs;

1 0

Jan Sikorski : winemac.drv: Include depth32+stencil pixel formats in enumeration.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 52f5e431ede771696b505021138562ca0c5f28c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52f5e431ede771696b505021… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Jan 18 14:18:17 2021 +0100 winemac.drv: Include depth32+stencil pixel formats in enumeration. This is especially important for M1 GPUs as they don't support the 24/8 format. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 88220e0ee41640940e7686fe0cab7f1e0bfb42f1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/opengl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index b66af0f1c47..9f02e93d376 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -741,7 +741,8 @@ static void enum_renderer_pixel_formats(renderer_properties renderer, CFMutableA if (!(renderer.stencil_modes & depth_stencil_modes[stencil_mode].mode)) continue; - if (accelerated && depth_stencil_modes[depth_mode].bits != 24 && stencil_mode > 0) + if (accelerated && depth_stencil_modes[depth_mode].bits != 24 && + depth_stencil_modes[depth_mode].bits != 32 && stencil_mode > 0) continue; attribs[n++] = kCGLPFAStencilSize;

1 0

Brendan Shanks : winemac.drv: Fix crash when building against Metal-capable SDK but running on older OS X.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: cb9b17fa856dd8c43a52077598088688fcb917f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb9b17fa856dd8c43a520775… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Mar 10 15:25:20 2021 -0800 winemac.drv: Fix crash when building against Metal-capable SDK but running on older OS X. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50790 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d52c4eb00ca0a0374bef81a1d794026f41399b19) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 2e50b67c7d1..dfd70f10792 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -343,10 +343,15 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp int ret = -1; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + /* Test if Metal is available */ + if (&CGDirectDisplayCopyCurrentMetalDevice == NULL) + goto done; + device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; if (device && [device respondsToSelector:@selector(registryID)]) ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); +done: [pool release]; return ret; }

1 0

Brendan Shanks : winemac.drv: Use Metal to get a display's GPU info if possible.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: aa83195f1a4ee5dfc1d8a50b5d5f85d2d5e9cc84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa83195f1a4ee5dfc1d8a50b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jan 27 11:16:46 2021 -0800 winemac.drv: Use Metal to get a display's GPU info if possible. Fixes an Apple Silicon issue where CGDisplayIOServicePort() returns a fake AMD GPU "compatibility" node rather than the real GPU node. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ae319caa3bf97b0ab688b1f44418dfd9d522f115) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index e769772feaa..2e50b67c7d1 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -330,6 +330,27 @@ done: return ret; } +/*********************************************************************** + * macdrv_get_gpu_info_from_display_id_using_metal + * + * Get GPU information for a CG display id using Metal. + * + * Returns non-zero value on failure. + */ +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + id<MTLDevice> device; + int ret = -1; + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; + if (device && [device respondsToSelector:@selector(registryID)]) + ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); + + [pool release]; + return ret; +} + #else static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) @@ -337,20 +358,32 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) return -1; } +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + return -1; +} + #endif /*********************************************************************** * macdrv_get_gpu_info_from_display_id * * Get GPU information from a display id. - * This is a fallback for 32bit build or older Mac OS version where Metal is unavailable. * * Returns non-zero value on failure. */ static int macdrv_get_gpu_info_from_display_id(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) { - io_registry_entry_t entry = CGDisplayIOServicePort(display_id); - return macdrv_get_gpu_info_from_entry(gpu, entry); + int ret; + io_registry_entry_t entry; + + ret = macdrv_get_gpu_info_from_display_id_using_metal(gpu, display_id); + if (ret) + { + entry = CGDisplayIOServicePort(display_id); + ret = macdrv_get_gpu_info_from_entry(gpu, entry); + } + return ret; } /***********************************************************************

1 0

Brendan Shanks : winemac.drv: Handle non-PCI GPUs correctly.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 5faad354d84bac04fac12a8730de2403353cb91c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5faad354d84bac04fac12a87… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jan 27 11:16:47 2021 -0800 winemac.drv: Handle non-PCI GPUs correctly. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5fbd40520d9a1505764b9e7b86f01d663b3aa391) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index dfd70f10792..05f1c75d53b 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -183,7 +183,9 @@ done: /*********************************************************************** * macdrv_get_gpu_info_from_entry * - * Starting from entry, search upwards to find the PCI GPU. And get GPU information from the PCI GPU entry. + * Starting from entry (which must be the GPU or a child below the GPU), + * search upwards to find the IOPCIDevice and get information from it. + * In case the GPU is not a PCI device, get properties from 'entry'. * * Returns non-zero value on failure. */ @@ -193,18 +195,21 @@ static int macdrv_get_gpu_info_from_entry(struct macdrv_gpu* gpu, io_registry_en io_registry_entry_t gpu_entry; kern_return_t result; int ret = -1; - char buffer[64]; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; gpu_entry = entry; - while (![@"IOPCIDevice" isEqualToString:[(NSString*)IOObjectCopyClass(gpu_entry) autorelease]] - || get_entry_property_string(gpu_entry, CFSTR("IOName"), buffer, sizeof(buffer)) - || strcmp(buffer, "display")) + while (![@"IOPCIDevice" isEqualToString:[(NSString*)IOObjectCopyClass(gpu_entry) autorelease]]) { result = IORegistryEntryGetParentEntry(gpu_entry, kIOServicePlane, &parent_entry); if (gpu_entry != entry) IOObjectRelease(gpu_entry); - if (result != kIOReturnSuccess) + if (result == kIOReturnNoDevice) + { + /* If no IOPCIDevice node is found, get properties from the given entry. */ + gpu_entry = entry; + break; + } + else if (result != kIOReturnSuccess) { [pool release]; return ret; @@ -409,6 +414,7 @@ static int macdrv_get_gpus_from_iokit(struct macdrv_gpu** new_gpus, int* count) int integrated_index = -1; int primary_index = 0; int gpu_count = 0; + char buffer[64]; int ret = -1; int i; @@ -422,7 +428,9 @@ static int macdrv_get_gpus_from_iokit(struct macdrv_gpu** new_gpus, int* count) while ((entry = IOIteratorNext(iterator))) { - if (!macdrv_get_gpu_info_from_entry(&gpus[gpu_count], entry)) + if (!get_entry_property_string(entry, CFSTR("IOName"), buffer, sizeof(buffer)) && + !strcmp(buffer, "display") && + !macdrv_get_gpu_info_from_entry(&gpus[gpu_count], entry)) { gpu_count++; assert(gpu_count < MAX_GPUS);

1 0

Martin Storsjo : msvcrt: Fix reading BOM-less files opened with ccs=unicode.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: be1c8a56a39e03e13446a26d12bdacafbd57ee37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be1c8a56a39e03e13446a26d… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 27 19:07:26 2021 +0100 msvcrt: Fix reading BOM-less files opened with ccs=unicode. This fixes a regression in running MSVC 2010 in wine, when reading .def files (regressed in b0ab1b76029eaface724a28483fe8b0ea36029dc). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fb0fa9aacf0d58b3fd5f26255858a744b29ee000) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/file.c | 6 ++++-- dlls/msvcrt/tests/file.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ba534568119..73e1a82476f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2329,6 +2329,7 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm msvcrt_set_errno(GetLastError()); return *_errno(); } + oflags |= _O_U16TEXT; } } else if (access & GENERIC_READ) @@ -2346,8 +2347,9 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm return *_errno(); if (oflags & _O_WTEXT) - get_ioinfo_nolock(*fd)->exflag |= EF_UTF16|EF_UNK_UNICODE; - else if (oflags & _O_U16TEXT) + get_ioinfo_nolock(*fd)->exflag |= EF_UNK_UNICODE; + + if (oflags & _O_U16TEXT) get_ioinfo_nolock(*fd)->exflag |= EF_UTF16; else if (oflags & _O_U8TEXT) get_ioinfo_nolock(*fd)->exflag |= EF_UTF8; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index ecf99e38b0e..0cf8bad124f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1039,6 +1039,40 @@ static void test_fgetwc_unicode(void) ch = fgetwc(tempfh); ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); fclose(tempfh); + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + ret = WideCharToMultiByte(CP_UTF8, 0, wchar_text + 1, ARRAY_SIZE(wchar_text) - 1, + utf8_text, sizeof(utf8_text), NULL, NULL); + ok(ret > 0, "utf-8 conversion failed\n"); + utf8_text[ret] = 0; + fwrite(utf8_text, sizeof(char), ret, tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt, ccs=UTF-8"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < ARRAY_SIZE(wchar_text); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (utf8[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (utf8)\n", ch); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt, ccs=unicode"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 0; utf8_text[i]; i++) + { + ch = fgetwc(tempfh); + ok(ch == (unsigned char) utf8_text[i], + "got %04hx, expected %04x (unicode[%d])\n", ch, (unsigned char)utf8_text[i], i); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); + fclose(tempfh); + unlink(temppath); }

1 0

Michael Stefaniuc : Release 6.0.1.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 46e876377fe82ea2c7e2382ac1495996d9b3222e URL: https://source.winehq.org/git/wine.git/?a=commit;h=46e876377fe82ea2c7e2382a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 19 23:11:57 2021 +0200 Release 6.0.1. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 717 ++++++++++++++++++++++---------------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 265 insertions(+), 475 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=46e876377fe82ea2c7e2…

1 0

Tag wine-6.0.1 : Alexandre Julliard : Release 6.0.1
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: refs/tags/wine-6.0.1 Tag: 5e0f21ed92f3b1e0094dc8df60ba039105302f90 URL: https://source.winehq.org/git/wine.git/?a=tag;h=5e0f21ed92f3b1e0094dc8df60b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 7 22:00:25 2021 +0200 Release 6.0.1

1 0

Andrey Gusev : wined3d: Add AMD Radeon RX 5500M.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 1256e6226f450bc0161eb9c3b57e142b2a976626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1256e6226f450bc0161eb9c3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Feb 3 20:08:44 2021 +0200 wined3d: Add AMD Radeon RX 5500M. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c66e0e5723df466ec8e00c4d1589518efb1eb761) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 3 ++- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index b6be5854714..9338bd2ba10 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1646,8 +1646,9 @@ cards_intel[] = * drivers: R700, RV790, R680, RV535, RV516, R410, RS485, RV360, RV351. */ cards_amd_mesa[] = { - /* Navi 10 */ + /* Navi 10/14 */ {"NAVI10", CARD_AMD_RADEON_RX_NAVI_10}, + {"NAVI14", CARD_AMD_RADEON_RX_NAVI_14}, /* Polaris 10/11 */ {"POLARIS10", CARD_AMD_RADEON_RX_480}, {"POLARIS11", CARD_AMD_RADEON_RX_460}, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2764b113065..9e8c611fd7b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -512,6 +512,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RAVEN, "AMD Radeon(TM) Vega 10 Mobile Graphics", DRIVER_AMD_RX, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_14, "Radeon RX 5500M", DRIVER_AMD_RX, 4096}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 04a931c9bfc..d7323e38a76 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2897,6 +2897,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RAVEN = 0x15dd, CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, + CARD_AMD_RADEON_RX_NAVI_14 = 0x7340, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0