mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-30 04:38:32 +00:00
win32u: Use common name for fake GPUs and prefer Vulkan name over it.
Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki@leancode.pl>
This commit is contained in:
parent
4a4292d3e1
commit
cb98a9b5ab
|
@ -1252,7 +1252,7 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID *
|
|||
if (vulkan_uuid) ctx->gpu.vulkan_uuid = *vulkan_uuid;
|
||||
else if (vulkan_gpu) ctx->gpu.vulkan_uuid = vulkan_gpu->uuid;
|
||||
|
||||
if (!name && vulkan_gpu) name = vulkan_gpu->name;
|
||||
if ((!name || !strcmp( name, "Wine GPU" )) && vulkan_gpu) name = vulkan_gpu->name;
|
||||
if (name) RtlUTF8ToUnicodeN( ctx->gpu.name, sizeof(ctx->gpu.name) - sizeof(WCHAR), &len, name, strlen( name ) );
|
||||
|
||||
snprintf( ctx->gpu.path, sizeof(ctx->gpu.path), "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X\\%08X",
|
||||
|
@ -1799,7 +1799,7 @@ static NTSTATUS default_update_display_devices( struct device_manager_ctx *ctx )
|
|||
struct gdi_monitor monitor = {0};
|
||||
DEVMODEW mode = {.dmSize = sizeof(mode)};
|
||||
|
||||
add_gpu( "Default GPU", &pci_id, NULL, ctx );
|
||||
add_gpu( "Wine GPU", &pci_id, NULL, ctx );
|
||||
add_source( "Default", source_flags, ctx );
|
||||
|
||||
if (!read_source_mode( ctx->source_key, ENUM_CURRENT_SETTINGS, &mode ))
|
||||
|
|
|
@ -281,7 +281,7 @@ UINT ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manag
|
|||
};
|
||||
DEVMODEW current = mode;
|
||||
|
||||
device_manager->add_gpu( "Android GPU", &pci_id, NULL, param );
|
||||
device_manager->add_gpu( "Wine GPU", &pci_id, NULL, param );
|
||||
device_manager->add_source( "Default", source_flags, param );
|
||||
device_manager->add_monitor( &gdi_monitor, param );
|
||||
|
||||
|
|
|
@ -193,7 +193,7 @@ static void wayland_add_device_gpu(const struct gdi_device_manager *device_manag
|
|||
|
||||
TRACE("\n");
|
||||
|
||||
device_manager->add_gpu("Wayland GPU", &pci_id, NULL, param);
|
||||
device_manager->add_gpu("Wine GPU", &pci_id, NULL, param);
|
||||
}
|
||||
|
||||
static void wayland_add_device_source(const struct gdi_device_manager *device_manager,
|
||||
|
|
|
@ -199,7 +199,7 @@ static BOOL xinerama_get_gpus( struct x11drv_gpu **new_gpus, int *count, BOOL ge
|
|||
if (!gpus)
|
||||
return FALSE;
|
||||
|
||||
gpus[0].name = strdup( "Xinerama GPU" );
|
||||
gpus[0].name = strdup( "Wine GPU" );
|
||||
*new_gpus = gpus;
|
||||
*count = 1;
|
||||
|
||||
|
|
|
@ -787,7 +787,7 @@ static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count, BOOL ge
|
|||
if (!provider_resources->nproviders)
|
||||
{
|
||||
WARN("XRandR implementation doesn't report any providers, faking one.\n");
|
||||
gpus[0].name = strdup( "Xrandr GPU" );
|
||||
gpus[0].name = strdup( "Wine GPU" );
|
||||
*new_gpus = gpus;
|
||||
*count = 1;
|
||||
ret = TRUE;
|
||||
|
|
Loading…
Reference in a new issue