ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit ae319caa3b)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
Brendan Shanks 2021-01-27 11:16:46 -08:00 committed by Michael Stefaniuc
parent 52f5e431ed
commit aa83195f1a
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dlls/winemac.drv/cocoa_display.m
View File

@ -330,6 +330,27 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count)
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;
}
/***********************************************************************