[PATCH 3/7] winemac.drv: Add macdrv_get_adapters() helper.
Zhiyi Zhang
zzhang at codeweavers.com
Mon Apr 22 07:13:30 CDT 2019
Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
---
dlls/winemac.drv/cocoa_display.m | 72 ++++++++++++++++++++++++++++++++++++++++
dlls/winemac.drv/macdrv_cocoa.h | 15 +++++++++
2 files changed, 87 insertions(+)
diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m
index 569cd32352..d95cda59c9 100644
--- a/dlls/winemac.drv/cocoa_display.m
+++ b/dlls/winemac.drv/cocoa_display.m
@@ -271,3 +271,75 @@ void macdrv_free_gpus(struct macdrv_gpu* gpus)
{
free(gpus);
}
+
+/***********************************************************************
+ * macdrv_get_adapters
+ *
+ * Get a list of adapters under gpu_id. The first adapter is primary if GPU is primary.
+ * Call macdrv_free_adapters() when you are done using the data.
+ *
+ * Return -1 on failure with parameters unchanged.
+ */
+int macdrv_get_adapters(uint64_t gpu_id, struct macdrv_adapter** new_adapters, int* count)
+{
+ struct macdrv_adapter* adapters;
+ CGDirectDisplayID display_ids[16];
+ uint32_t display_id_count;
+ uint32_t i;
+ int primary_index = 0;
+ int adapter_count = 0;
+
+ if (CGGetOnlineDisplayList(sizeof(display_ids) / sizeof(display_ids[0]), display_ids, &display_id_count)
+ != kCGErrorSuccess)
+ return -1;
+
+ /* Actual adapter count may be less */
+ adapters = calloc(display_id_count, sizeof(*adapters));
+ if (!adapters)
+ return -1;
+
+ for (i = 0; i < display_id_count; i++)
+ {
+ /* Mirrored displays are under the same adapter with primary display, so they doesn't increase adapter count */
+ if (CGDisplayMirrorsDisplay(display_ids[i]) != kCGNullDirectDisplay)
+ continue;
+
+ id<MTLDevice> device = CGDirectDisplayCopyCurrentMetalDevice(display_ids[i]);
+ if (!device || device.registryID == gpu_id)
+ {
+ adapters[adapter_count].id = display_ids[i];
+ if (CGDisplayIsMain(display_ids[i]))
+ {
+ adapters[adapter_count].state_flags |= DISPLAY_DEVICE_PRIMARY_DEVICE;
+ primary_index = adapter_count;
+ }
+ if (CGDisplayIsActive(display_ids[i]) || CGDisplayIsInMirrorSet(display_ids[i]))
+ adapters[adapter_count].state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP;
+
+ adapter_count++;
+ }
+ }
+
+ /* Make sure the first adapter is primary if the GPU is primary */
+ if (primary_index)
+ {
+ struct macdrv_adapter tmp;
+ tmp = adapters[0];
+ adapters[0] = adapters[primary_index];
+ adapters[primary_index] = tmp;
+ }
+
+ *new_adapters = adapters;
+ *count = adapter_count;
+ return 0;
+}
+
+/***********************************************************************
+ * macdrv_free_adapters
+ *
+ * Free an adapter list allocated from macdrv_get_adapters()
+ */
+void macdrv_free_adapters(struct macdrv_adapter* adapters)
+{
+ free(adapters);
+}
diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h
index a6d8ec91d4..a57b94c125 100644
--- a/dlls/winemac.drv/macdrv_cocoa.h
+++ b/dlls/winemac.drv/macdrv_cocoa.h
@@ -258,6 +258,10 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point)
/* display */
+/* Used DISPLAY_DEVICE.StateFlags for adapters */
+#define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001
+#define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004
+
/* Represent a physical GPU in the PCI slots */
struct macdrv_gpu
{
@@ -272,12 +276,23 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point)
uint32_t revision_id;
};
+/* Represent an adapter in EnumDisplayDevices context */
+struct macdrv_adapter
+{
+ /* ID to uniquely identify an adapter. Currently it's a CGDirectDisplayID */
+ uint32_t id;
+ /* as StateFlags in DISPLAY_DEVICE struct */
+ uint32_t state_flags;
+};
+
extern int macdrv_get_displays(struct macdrv_display** displays, int* count) DECLSPEC_HIDDEN;
extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDEN;
extern int macdrv_set_display_mode(const struct macdrv_display* display,
CGDisplayModeRef display_mode) DECLSPEC_HIDDEN;
extern int macdrv_get_gpus(struct macdrv_gpu** gpus, int* count) DECLSPEC_HIDDEN;
extern void macdrv_free_gpus(struct macdrv_gpu* gpus) DECLSPEC_HIDDEN;
+extern int macdrv_get_adapters(uint64_t gpu_id, struct macdrv_adapter** adapters, int* count) DECLSPEC_HIDDEN;
+extern void macdrv_free_adapters(struct macdrv_adapter* adapters) DECLSPEC_HIDDEN;
/* event */
--
2.15.2 (Apple Git-101.1)
More information about the wine-devel
mailing list