Mirrored_Repos/DisplayMagician
1
0
Fork 0
mirror of https://github.com/terrymacdonald/DisplayMagician.git synced 2024-08-30 18:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
108a08688f
DisplayMagician/DisplayMagicianShared/AMD/ADLWrapper.cs

1050 lines
97 KiB
C#
Raw Normal View History

[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Runtime.InteropServices;
using ATI.ADL;
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
using Microsoft.Win32.SafeHandles;
using DisplayMagicianShared;
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
using System.Threading;
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
namespace DisplayMagicianShared.AMD
{
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
public class ADLWrapper : IDisposable
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
{
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
// Static members are 'eagerly initialized', that is,
// immediately when class is loaded for the first time.
// .NET guarantees thread safety for static initialization
private static ADLWrapper _instance = new ADLWrapper();
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
private bool _initialised = false;
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
private bool _initialisedADL2 = false;
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
// To detect redundant calls
private bool _disposed = false;
// Instantiate a SafeHandle instance.
private SafeHandle _safeHandle = new SafeFileHandle(IntPtr.Zero, true);
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
private IntPtr _adlContextHandle = IntPtr.Zero;
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
static ADLWrapper() { }
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
public ADLWrapper()
{
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
int ADLRet = ADL.ADL_ERR;
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
SharedLogger.logger.Trace("ADLWrapper/ADLWrapper: Intialising ADL library");
try
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
{
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
if (ADL.ADL_Main_Control_Create != null)
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
{
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
// Second parameter is 1: Get only the present adapters
ADLRet = ADL.ADL_Main_Control_Create(ADL.ADL_Main_Memory_Alloc, 1);
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
}
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
if (ADLRet == ADL.ADL_OK)
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
{
_initialised = true;
SharedLogger.logger.Trace("ADLWrapper/ADLWrapper: ADL library was initialised successfully");
}
else
{
SharedLogger.logger.Error("ADLWrapper/ADLWrapper: Error intialising ADL library. ADL_Main_Control_Create() returned error code " + ADLRet.ToString());
}
}
catch (Exception ex)
{
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
SharedLogger.logger.Error(ex, "ADLWrapper/ADLWrapper: Exception intialising ADL library. ADL_Main_Control_Create() caused an exception");
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
}
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
try
{
if (ADL.ADL2_Main_Control_Create != null)
{
// Second parameter is 1: Get only the present adapters
ADLRet = ADL.ADL2_Main_Control_Create(ADL.ADL_Main_Memory_Alloc, 1, out _adlContextHandle);
}
if (ADLRet == ADL.ADL_OK)
{
_initialisedADL2 = true;
SharedLogger.logger.Trace("ADLWrapper/ADLWrapper: ADL2 library was initialised successfully");
}
else
{
SharedLogger.logger.Error("ADLWrapper/ADLWrapper: Error intialising ADL2 library. ADL2_Main_Control_Create() returned error code " + ADL.ConvertADLReturnValueIntoWords(ADLRet));
}
}
catch (Exception ex)
{
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
SharedLogger.logger.Error(ex, "ADLWrapper/ADLWrapper: Exception intialising ADL2 library. ADL2_Main_Control_Create() caused an exception");
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
}
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
}
~ADLWrapper()
{
// If the ADL library was initialised, then we need to free it up.
if (_initialised)
{
if (null != ADL.ADL_Main_Control_Destroy)
ADL.ADL_Main_Control_Destroy();
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
}
// If the ADL2 library was initialised, then we need to free it up.
if (_initialisedADL2)
{
if (null != ADL.ADL2_Main_Control_Destroy)
ADL.ADL2_Main_Control_Destroy(_adlContextHandle);
}
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
}
// Public implementation of Dispose pattern callable by consumers.
public void Dispose() => Dispose(true);
// Protected implementation of Dispose pattern.
protected virtual void Dispose(bool disposing)
{
if (_disposed)
{
return;
}
if (disposing)
{
if (null != ADL.ADL_Main_Control_Destroy)
ADL.ADL_Main_Control_Destroy();
// Dispose managed state (managed objects).
_safeHandle?.Dispose();
}
_disposed = true;
}
public bool IsInstalled
{
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
get { return _initialised || _initialisedADL2; }
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
}
public static ADLWrapper GetLibrary()
{
return _instance;
}
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
public List<string> GenerateProfileDisplayIdentifiers()
{
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Getting AMD active adapter count");
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
int ADLRet = ADL.ADL_ERR;
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
int NumberOfAdapters = 0;
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
List<string> displayIdentifiers = new List<string>();
[WIP] Partial move to ADL2 Need to do this to gain access to extra useful fields that just don't exist in ADL functions. Example being HDR capabilties.
2021-06-18 06:02:14 +00:00
if (null != ADL.ADL2_Adapter_NumberOfAdapters_Get)
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
{
[WIP] Partial move to ADL2 Need to do this to gain access to extra useful fields that just don't exist in ADL functions. Example being HDR capabilties.
2021-06-18 06:02:14 +00:00
ADL.ADL2_Adapter_NumberOfAdapters_Get(_adlContextHandle, ref NumberOfAdapters);
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Number Of Adapters: {NumberOfAdapters.ToString()} ");
}
if (NumberOfAdapters > 0)
{
IntPtr AdapterBuffer = IntPtr.Zero;
[WIP] Partial move to ADL2 Need to do this to gain access to extra useful fields that just don't exist in ADL functions. Example being HDR capabilties.
2021-06-18 06:02:14 +00:00
if (ADL.ADL2_Adapter_AdapterInfoX4_Get != null)
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
{
[WIP] Additional ADL2 conversions
2021-06-18 06:11:32 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: ADL2_Adapter_AdapterInfoX4_Get DLL function exists.");
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
// Get the Adapter info and put it in the AdapterBuffer
[WIP] Additional ADL2 conversions
2021-06-18 06:11:32 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Running ADL2_Adapter_AdapterInfoX4_Get to find all known AMD adapters.");
[WIP] Partial move to ADL2 Need to do this to gain access to extra useful fields that just don't exist in ADL functions. Example being HDR capabilties.
2021-06-18 06:02:14 +00:00
//ADLRet = ADL.ADL2_Adapter_AdapterInfoX4_Get(_adlContextHandle, AdapterBuffer, size);
int numAdapters = 0;
ADLRet = ADL.ADL2_Adapter_AdapterInfoX4_Get(_adlContextHandle, ADL.ADL_ADAPTER_INDEX_ALL, out numAdapters, out AdapterBuffer);
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
if (ADLRet == ADL.ADL_OK)
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
{
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
int IsActive = ADL.ADL_TRUE; // We only want to search for active adapters
[WIP] Additional ADL2 conversions
2021-06-18 06:11:32 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Successfully run ADL2_Adapter_AdapterInfoX4_Get to find information about all known AMD adapters.");
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
ADLAdapterInfoX2 oneAdapter = new ADLAdapterInfoX2();
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
// Go through each adapter
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
for (int adapterLoop = 0; adapterLoop < numAdapters; adapterLoop++)
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
{
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
oneAdapter = (ADLAdapterInfoX2)Marshal.PtrToStructure(new IntPtr(AdapterBuffer.ToInt64() + (adapterLoop * Marshal.SizeOf(oneAdapter))), oneAdapter.GetType());
[WIP] Working nearly DisplayIds Have now go the required data, but for some reason AMD is returning two valid adapters when there is actually just one in the system! Could be a problem with the device installation, but I will need figuring out how to either remove duplicates, or figure out the information to use as a filter for ignoring one of the adapters.
2021-06-19 01:04:38 +00:00
if (oneAdapter.Exist != 1)
{
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} doesn't exist at present so skipping detection for this adapter.");
Console.WriteLine($"ADLWrapper/GenerateProfileDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} doesn't exist at present so skipping detection for this adapter.");
continue;
}
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
[WIP] Working nearly DisplayIds Have now go the required data, but for some reason AMD is returning two valid adapters when there is actually just one in the system! Could be a problem with the device installation, but I will need figuring out how to either remove duplicates, or figure out the information to use as a filter for ignoring one of the adapters.
2021-06-19 01:04:38 +00:00
if (oneAdapter.Present != 1)
{
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} isn't enabled at present so skipping detection for this adapter.");
Console.WriteLine($"ADLWrapper/GenerateProfileDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} isn't enabled at present so skipping detection for this adapter.");
continue;
}
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
// Check if the adapter is active
[WIP] Additional ADL2 conversions
2021-06-18 06:11:32 +00:00
if (ADL.ADL2_Adapter_Active_Get != null)
ADLRet = ADL.ADL2_Adapter_Active_Get(_adlContextHandle, oneAdapter.AdapterIndex, ref IsActive);
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
if (ADLRet == ADL.ADL_OK)
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
{
// Only continue if the adapter is enabled
if (IsActive != ADL.ADL_TRUE)
{
[WIP] Working nearly DisplayIds Have now go the required data, but for some reason AMD is returning two valid adapters when there is actually just one in the system! Could be a problem with the device installation, but I will need figuring out how to either remove duplicates, or figure out the information to use as a filter for ignoring one of the adapters.
2021-06-19 01:04:38 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} isn't active ({oneAdapter.AdapterName}).");
continue;
}
// Only continue if the adapter index is > 0
if (oneAdapter.AdapterIndex < 0)
{
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: AMD Adapter has an adapter index of {oneAdapter.AdapterIndex.ToString()} which indicates it is not a real adapter.");
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
continue;
}
[WIP] Working nearly DisplayIds Have now go the required data, but for some reason AMD is returning two valid adapters when there is actually just one in the system! Could be a problem with the device installation, but I will need figuring out how to either remove duplicates, or figure out the information to use as a filter for ignoring one of the adapters.
2021-06-19 01:04:38 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} is active! ({oneAdapter.AdapterName}).");
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: ### Adapter Info for Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter AdapterIndex = {oneAdapter.AdapterIndex}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter AdapterName = {oneAdapter.AdapterName}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter BusNumber = {oneAdapter.BusNumber}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter DeviceNumber = {oneAdapter.DeviceNumber}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter DisplayName = {oneAdapter.DisplayName}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter DriverPath = {oneAdapter.DriverPath}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter DriverPathExt = {oneAdapter.DriverPathExt}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter Exist = {oneAdapter.Exist}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter FunctionNumber = {oneAdapter.FunctionNumber}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter InfoMask = {oneAdapter.InfoMask}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter InfoValue = {oneAdapter.InfoValue}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter OSDisplayIndex = {oneAdapter.OSDisplayIndex}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter PNPString = {oneAdapter.PNPString}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter Present = {oneAdapter.Present}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter Size = {oneAdapter.Size}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter UDID = {oneAdapter.UDID}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter VendorID = {oneAdapter.VendorID}");
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
[WIP] Working adapter and display grabbing Need to add Display Device info extraction. Have created consts for the connector types in c#, but now need to add the logic to decode the ADLDeviceConfig returned value!
2021-06-16 10:15:15 +00:00
// Get the Adapter Capabilities
ADLAdapterCapsX2 AdapterCapabilities = new ADLAdapterCapsX2();
[WIP] Enough data for the Idenitifier We now have enough data for me to identify all the connected display devices, and to generate a display identifier which will work no matter if AMD Eyefinity is enabled or not! This should allow me to generate an display identifier that will work like the NVIDIA ones.
2021-06-18 09:31:55 +00:00
if (ADL.ADL2_AdapterX2_Caps != null)
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
{
[WIP] Enough data for the Idenitifier We now have enough data for me to identify all the connected display devices, and to generate a display identifier which will work no matter if AMD Eyefinity is enabled or not! This should allow me to generate an display identifier that will work like the NVIDIA ones.
2021-06-18 09:31:55 +00:00
ADLRet = ADL.ADL2_AdapterX2_Caps(_adlContextHandle, oneAdapter.AdapterIndex, out AdapterCapabilities);
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
}
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: ### Adapter Capabilities for Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter ID = {AdapterCapabilities.AdapterID}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter Capabilities Mask = {AdapterCapabilities.CapsMask}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter Capabilities Value = {AdapterCapabilities.CapsValue}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter Num of Connectors = {AdapterCapabilities.NumConnectors}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter Num of Controllers = {AdapterCapabilities.NumControllers}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter Num of Displays = {AdapterCapabilities.NumDisplays}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter Num of GL Sync Connectors = {AdapterCapabilities.NumOfGLSyncConnectors}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Adapter Num of Overlays = {AdapterCapabilities.NumOverlays}");
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
// Obtain information about displays
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
//ADLDisplayInfoArray displayInfoArray = new ADLDisplayInfoArray();
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
[WIP] Enough data for the Idenitifier We now have enough data for me to identify all the connected display devices, and to generate a display identifier which will work no matter if AMD Eyefinity is enabled or not! This should allow me to generate an display identifier that will work like the NVIDIA ones.
2021-06-18 09:31:55 +00:00
if (ADL.ADL2_Display_DisplayInfo_Get != null)
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
{
IntPtr DisplayBuffer = IntPtr.Zero;
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
int numDisplays = 0;
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
// Force the display detection and get the Display Info. Use 0 as last parameter to NOT force detection
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
ADLRet = ADL.ADL2_Display_DisplayInfo_Get(_adlContextHandle, oneAdapter.AdapterIndex, ref numDisplays, out DisplayBuffer, 0);
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
if (ADLRet == ADL.ADL_OK)
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
{
try
{
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
ADLDisplayInfo oneDisplayInfo = new ADLDisplayInfo();
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
for (int displayLoop = 0; displayLoop < numDisplays; displayLoop++)
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
{
Fix incorrect marshalling struct
2021-06-19 08:24:29 +00:00
oneDisplayInfo = (ADLDisplayInfo)Marshal.PtrToStructure(new IntPtr(DisplayBuffer.ToInt64() + (displayLoop * Marshal.SizeOf(oneDisplayInfo))), oneDisplayInfo.GetType());
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
[WIP] Enough data for the Idenitifier We now have enough data for me to identify all the connected display devices, and to generate a display identifier which will work no matter if AMD Eyefinity is enabled or not! This should allow me to generate an display identifier that will work like the NVIDIA ones.
2021-06-18 09:31:55 +00:00
if (oneDisplayInfo.DisplayID.DisplayLogicalAdapterIndex == -1)
{
[WIP] Working nearly DisplayIds Have now go the required data, but for some reason AMD is returning two valid adapters when there is actually just one in the system! Could be a problem with the device installation, but I will need figuring out how to either remove duplicates, or figure out the information to use as a filter for ignoring one of the adapters.
2021-06-19 01:04:38 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} ({oneAdapter.AdapterName}) AdapterID display ID#{oneDisplayInfo.DisplayID.DisplayLogicalIndex} is not a real display as its DisplayID.DisplayLogicalAdapterIndex is -1");
[WIP] Enough data for the Idenitifier We now have enough data for me to identify all the connected display devices, and to generate a display identifier which will work no matter if AMD Eyefinity is enabled or not! This should allow me to generate an display identifier that will work like the NVIDIA ones.
2021-06-18 09:31:55 +00:00
continue;
}
// Convert the displayInfoValue to something usable using a library function I made
ConvertedDisplayInfoValue displayInfoValue = ADL.ConvertDisplayInfoValue(oneDisplayInfo.DisplayInfoValue);
if (!displayInfoValue.DISPLAYCONNECTED)
{
[WIP] Working nearly DisplayIds Have now go the required data, but for some reason AMD is returning two valid adapters when there is actually just one in the system! Could be a problem with the device installation, but I will need figuring out how to either remove duplicates, or figure out the information to use as a filter for ignoring one of the adapters.
2021-06-19 01:04:38 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} ({oneAdapter.AdapterName}) AdapterID display ID#{oneDisplayInfo.DisplayID.DisplayLogicalIndex} is not connected");
[WIP] Enough data for the Idenitifier We now have enough data for me to identify all the connected display devices, and to generate a display identifier which will work no matter if AMD Eyefinity is enabled or not! This should allow me to generate an display identifier that will work like the NVIDIA ones.
2021-06-18 09:31:55 +00:00
continue;
}
// Skip connected but non-mapped displays (not mapped in windows) - we want all displays currently visible in the OS
if (!displayInfoValue.DISPLAYMAPPED)
{
[WIP] Working nearly DisplayIds Have now go the required data, but for some reason AMD is returning two valid adapters when there is actually just one in the system! Could be a problem with the device installation, but I will need figuring out how to either remove duplicates, or figure out the information to use as a filter for ignoring one of the adapters.
2021-06-19 01:04:38 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} ({oneAdapter.AdapterName}) AdapterID display ID#{oneDisplayInfo.DisplayID.DisplayLogicalIndex} is not mapped in Windows OS");
[WIP] Enough data for the Idenitifier We now have enough data for me to identify all the connected display devices, and to generate a display identifier which will work no matter if AMD Eyefinity is enabled or not! This should allow me to generate an display identifier that will work like the NVIDIA ones.
2021-06-18 09:31:55 +00:00
continue;
}
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} ({oneAdapter.AdapterName}) AdapterID display ID#{oneDisplayInfo.DisplayID.DisplayLogicalIndex} is connected and mapped in Windows OS");
[WIP] Working nearly DisplayIds Have now go the required data, but for some reason AMD is returning two valid adapters when there is actually just one in the system! Could be a problem with the device installation, but I will need figuring out how to either remove duplicates, or figure out the information to use as a filter for ignoring one of the adapters.
2021-06-19 01:04:38 +00:00
ADL.ADLDisplayConnectionType displayConnector = (ADL.ADLDisplayConnectionType)oneDisplayInfo.DisplayConnector;
[WIP] Enough data for the Idenitifier We now have enough data for me to identify all the connected display devices, and to generate a display identifier which will work no matter if AMD Eyefinity is enabled or not! This should allow me to generate an display identifier that will work like the NVIDIA ones.
2021-06-18 09:31:55 +00:00
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: ### Display Info for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Connector = {displayConnector.ToString("G")}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Controller Index = {oneDisplayInfo.DisplayControllerIndex}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Logical Adapter Index = {oneDisplayInfo.DisplayID.DisplayLogicalAdapterIndex}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Logical Index = {oneDisplayInfo.DisplayID.DisplayLogicalIndex}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Physical Adapter Index = {oneDisplayInfo.DisplayID.DisplayPhysicalAdapterIndex}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Physical Index = {oneDisplayInfo.DisplayID.DisplayPhysicalIndex}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Mask = {oneDisplayInfo.DisplayInfoMask}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value = {oneDisplayInfo.DisplayInfoValue}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Manufacturer Name = {oneDisplayInfo.DisplayManufacturerName}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Name = {oneDisplayInfo.DisplayName}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Output Type = {oneDisplayInfo.DisplayOutputType}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Type = {oneDisplayInfo.DisplayType}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value DISPLAYCONNECTED = {displayInfoValue.DISPLAYCONNECTED}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value DISPLAYMAPPED = {displayInfoValue.DISPLAYMAPPED}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value FORCIBLESUPPORTED = {displayInfoValue.FORCIBLESUPPORTED}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value GENLOCKSUPPORTED = {displayInfoValue.GENLOCKSUPPORTED}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value LDA_DISPLAY = {displayInfoValue.LDA_DISPLAY}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_2HSTRETCH = {displayInfoValue.MANNER_SUPPORTED_2HSTRETCH}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_2VSTRETCH = {displayInfoValue.MANNER_SUPPORTED_2VSTRETCH}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_CLONE = {displayInfoValue.MANNER_SUPPORTED_CLONE}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_EXTENDED = {displayInfoValue.MANNER_SUPPORTED_EXTENDED}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_NSTRETCH1GPU = {displayInfoValue.MANNER_SUPPORTED_NSTRETCH1GPU}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_NSTRETCHNGPU = {displayInfoValue.MANNER_SUPPORTED_NSTRETCHNGPU}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_SINGLE = {displayInfoValue.MANNER_SUPPORTED_SINGLE}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value MODETIMING_OVERRIDESSUPPORTED = {displayInfoValue.MODETIMING_OVERRIDESSUPPORTED}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value MULTIVPU_SUPPORTED = {displayInfoValue.MULTIVPU_SUPPORTED}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value NONLOCAL = {displayInfoValue.NONLOCAL}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Info Value SHOWTYPE_PROJECTOR = {displayInfoValue.SHOWTYPE_PROJECTOR}");
[WIP] Working adapter and display grabbing Need to add Display Device info extraction. Have created consts for the connector types in c#, but now need to add the logic to decode the ADLDeviceConfig returned value!
2021-06-16 10:15:15 +00:00
[WIP] Working nearly DisplayIds Have now go the required data, but for some reason AMD is returning two valid adapters when there is actually just one in the system! Could be a problem with the device installation, but I will need figuring out how to either remove duplicates, or figure out the information to use as a filter for ignoring one of the adapters.
2021-06-19 01:04:38 +00:00
ADL.ADLDisplayConnectionType displayConnectionType = ADL.ADLDisplayConnectionType.Unknown;
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
ADLDisplayConfig displayConfig = new ADLDisplayConfig();
[WIP] Enough data for the Idenitifier We now have enough data for me to identify all the connected display devices, and to generate a display identifier which will work no matter if AMD Eyefinity is enabled or not! This should allow me to generate an display identifier that will work like the NVIDIA ones.
2021-06-18 09:31:55 +00:00
displayConfig.Size = Marshal.SizeOf(displayConfig);
if (ADL.ADL2_Display_DeviceConfig_Get != null)
[WIP] Working adapter and display grabbing Need to add Display Device info extraction. Have created consts for the connector types in c#, but now need to add the logic to decode the ADLDeviceConfig returned value!
2021-06-16 10:15:15 +00:00
{
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
// Get the DisplayConfig from the Display
[WIP] Enough data for the Idenitifier We now have enough data for me to identify all the connected display devices, and to generate a display identifier which will work no matter if AMD Eyefinity is enabled or not! This should allow me to generate an display identifier that will work like the NVIDIA ones.
2021-06-18 09:31:55 +00:00
ADLRet = ADL.ADL2_Display_DeviceConfig_Get(_adlContextHandle, oneAdapter.AdapterIndex, oneDisplayInfo.DisplayID.DisplayPhysicalIndex, out displayConfig);
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
if (ADLRet == ADL.ADL_OK)
{
[WIP] Working nearly DisplayIds Have now go the required data, but for some reason AMD is returning two valid adapters when there is actually just one in the system! Could be a problem with the device installation, but I will need figuring out how to either remove duplicates, or figure out the information to use as a filter for ignoring one of the adapters.
2021-06-19 01:04:38 +00:00
displayConnectionType = (ADL.ADLDisplayConnectionType)displayConfig.ConnectorType;
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: ### Display Device Config for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Connector Type = {displayConnectionType.ToString("G")}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Device Data = {displayConfig.DeviceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Overridded Device Data = {displayConfig.OverriddedDeviceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Reserved Data = {displayConfig.Reserved}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Size = {displayConfig.Size}");
}
else
{
SharedLogger.logger.Warn($"ADLWrapper/GenerateProfileDisplayIdentifiers: Error running ADL2_Display_DeviceConfig_Get on Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
}
}
ADLDDCInfo2 displayDDCInfo2 = new ADLDDCInfo2();
[WIP] Enough data for the Idenitifier We now have enough data for me to identify all the connected display devices, and to generate a display identifier which will work no matter if AMD Eyefinity is enabled or not! This should allow me to generate an display identifier that will work like the NVIDIA ones.
2021-06-18 09:31:55 +00:00
displayDDCInfo2.Size = Marshal.SizeOf(displayDDCInfo2);
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
// Create a stringbuilder buffer that EDID can be loaded into
//displayEDIDData.EDIDData = new StringBuilder(256);
[WIP] Working adapter and display grabbing Need to add Display Device info extraction. Have created consts for the connector types in c#, but now need to add the logic to decode the ADLDeviceConfig returned value!
2021-06-16 10:15:15 +00:00
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
if (ADL.ADL2_Display_DDCInfo2_Get != null)
{
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
// Get the DDC Data from the Display
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
ADLRet = ADL.ADL2_Display_DDCInfo2_Get(_adlContextHandle, oneAdapter.AdapterIndex, oneDisplayInfo.DisplayID.DisplayPhysicalIndex, out displayDDCInfo2);
if (ADLRet == ADL.ADL_OK)
{
[WIP] Added HDR functions to lib
2021-06-18 21:48:47 +00:00
// Convert the DDCInfoFlag to something usable using a library function I made
ConvertedDDCInfoFlag DDCInfoFlag = ADL.ConvertDDCInfoFlag(displayDDCInfo2.DDCInfoFlag);
// Convert the DDCInfoFlag to something usable using a library function I made
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
ConvertedSupportedHDR supportedHDR = ADL.ConvertSupportedHDR(displayDDCInfo2.SupportedHDR);
[WIP] Added HDR functions to lib
2021-06-18 21:48:47 +00:00
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: ### Display DDCInfo2 for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display AvgLuminanceData = {displayDDCInfo2.AvgLuminanceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display DDCInfoFlag = {displayDDCInfo2.DDCInfoFlag}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display DiffuseScreenReflectance = {displayDDCInfo2.DiffuseScreenReflectance}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display DisplayName = {displayDDCInfo2.DisplayName}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display FreesyncFlags = {displayDDCInfo2.FreesyncFlags}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display ManufacturerID = {displayDDCInfo2.ManufacturerID}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display MaxBacklightMaxLuminanceData = {displayDDCInfo2.MaxBacklightMaxLuminanceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display MaxBacklightMinLuminanceData = {displayDDCInfo2.MaxBacklightMinLuminanceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display MaxHResolution = {displayDDCInfo2.MaxHResolution}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display MaxLuminanceData = {displayDDCInfo2.MaxLuminanceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display MaxRefresh = {displayDDCInfo2.MaxRefresh}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display MaxVResolution = {displayDDCInfo2.MaxVResolution}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display MinBacklightMaxLuminanceData = {displayDDCInfo2.MinBacklightMaxLuminanceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display MinBacklightMinLuminanceData = {displayDDCInfo2.MinBacklightMinLuminanceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display MinLuminanceData = {displayDDCInfo2.MinLuminanceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display MinLuminanceNoDimmingData = {displayDDCInfo2.MinLuminanceNoDimmingData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display NativeDisplayChromaticityBlueX = {displayDDCInfo2.NativeDisplayChromaticityBlueX}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display NativeDisplayChromaticityBlueY = {displayDDCInfo2.NativeDisplayChromaticityBlueY}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display NativeDisplayChromaticityGreenX = {displayDDCInfo2.NativeDisplayChromaticityGreenX}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display NativeDisplayChromaticityGreenY = {displayDDCInfo2.NativeDisplayChromaticityGreenY}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display NativeDisplayChromaticityRedX = {displayDDCInfo2.NativeDisplayChromaticityRedX}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display NativeDisplayChromaticityRedY = {displayDDCInfo2.NativeDisplayChromaticityRedY}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display NativeDisplayChromaticityWhiteX = {displayDDCInfo2.NativeDisplayChromaticityWhiteX}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display NativeDisplayChromaticityWhiteY = {displayDDCInfo2.NativeDisplayChromaticityWhiteY}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display PackedPixelSupported = {displayDDCInfo2.PackedPixelSupported}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display PanelPixelFormat = {displayDDCInfo2.PanelPixelFormat}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display ProductID = {displayDDCInfo2.ProductID}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display PTMCx = {displayDDCInfo2.PTMCx}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display PTMCy = {displayDDCInfo2.PTMCy}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display PTMRefreshRate = {displayDDCInfo2.PTMRefreshRate}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display SerialID = {displayDDCInfo2.SerialID}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display Size = {displayDDCInfo2.Size}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display SpecularScreenReflectance = {displayDDCInfo2.SpecularScreenReflectance}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display SupportedColorSpace = {displayDDCInfo2.SupportedColorSpace}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display SupportedHDR = {displayDDCInfo2.SupportedHDR}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display SupportedTransferFunction = {displayDDCInfo2.SupportedTransferFunction}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display SupportsDDC = {displayDDCInfo2.SupportsDDC}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display DDCInfoFlag Digital Device = {DDCInfoFlag.DIGITALDEVICE}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display DDCInfoFlag EDID Extension = {DDCInfoFlag.EDIDEXTENSION}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display DDCInfoFlag HDMI Audio Device = {DDCInfoFlag.HDMIAUDIODEVICE}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display DDCInfoFlag Projector Device = {DDCInfoFlag.PROJECTORDEVICE}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display DDCInfoFlag Supports AI = {DDCInfoFlag.SUPPORTS_AI}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display DDCInfoFlag Supports xvYCC601 = {DDCInfoFlag.SUPPORT_xvYCC601}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display DDCInfoFlag Supports xvYCC709 = {DDCInfoFlag.SUPPORT_xvYCC709}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display SupportedHDR Supports CEA861_3 = {supportedHDR.CEA861_3}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display SupportedHDR Supports DOLBYVISION = {supportedHDR.DOLBYVISION}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display SupportedHDR Supports FREESYNC_HDR = {supportedHDR.FREESYNC_HDR}");
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
}
else
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
{
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
SharedLogger.logger.Warn($"ADLWrapper/GenerateProfileDisplayIdentifiers: Error running ADL2_Display_DDCInfo2_Get on Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
}
[WIP] Working adapter and display grabbing Need to add Display Device info extraction. Have created consts for the connector types in c#, but now need to add the logic to decode the ADLDeviceConfig returned value!
2021-06-16 10:15:15 +00:00
}
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
[WIP] Added HDR functions to lib
2021-06-18 21:48:47 +00:00
int HDRSupported = 0;
int HDREnabled = 0;
if (ADL.ADL2_Display_HDRState_Get != null)
{
// Get the HDR State from the Display
ADLRet = ADL.ADL2_Display_HDRState_Get(_adlContextHandle, oneAdapter.AdapterIndex, oneDisplayInfo.DisplayID, out HDRSupported, out HDREnabled);
if (ADLRet == ADL.ADL_OK)
{
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: ### Display HDR State for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display HDR Supported = {HDRSupported}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Display HDR Enabled = {HDREnabled}");
}
else
{
SharedLogger.logger.Warn($"ADLWrapper/GenerateProfileDisplayIdentifiers: Error running ADL2_Display_HDRState_Get on Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
[WIP] Added HDR functions to lib
2021-06-18 21:48:47 +00:00
}
}
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
// Create an array of all the important display info we need to record
List<string> displayInfoIdentifierSection = new List<string>();
displayInfoIdentifierSection.Add("AMD");
[WIP] Working nearly DisplayIds Have now go the required data, but for some reason AMD is returning two valid adapters when there is actually just one in the system! Could be a problem with the device installation, but I will need figuring out how to either remove duplicates, or figure out the information to use as a filter for ignoring one of the adapters.
2021-06-19 01:04:38 +00:00
try
{
displayInfoIdentifierSection.Add(oneAdapter.VendorID.ToString());
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateProfileDisplayIdentifiers: Exception getting AMD Vendor ID from video card. Substituting with a # instead");
displayInfoIdentifierSection.Add("#");
}
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
try
{
displayInfoIdentifierSection.Add(oneAdapter.AdapterName);
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateProfileDisplayIdentifiers: Exception getting AMD Adapter Name from video card. Substituting with a # instead");
displayInfoIdentifierSection.Add("#");
}
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
try
{
displayInfoIdentifierSection.Add(oneAdapter.VendorID.ToString());
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateProfileDisplayIdentifiers: Exception getting AMD VendorID from video card. Substituting with a # instead");
displayInfoIdentifierSection.Add("1002");
}
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
try
{
[WIP] Additional ADL2 conversions
2021-06-18 06:11:32 +00:00
displayInfoIdentifierSection.Add(AdapterCapabilities.AdapterID.ToString());
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateProfileDisplayIdentifiers: Exception getting AMD AdapterID from video card. Substituting with a # instead");
displayInfoIdentifierSection.Add("#");
}
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
try
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
{
[WIP] Working nearly DisplayIds Have now go the required data, but for some reason AMD is returning two valid adapters when there is actually just one in the system! Could be a problem with the device installation, but I will need figuring out how to either remove duplicates, or figure out the information to use as a filter for ignoring one of the adapters.
2021-06-19 01:04:38 +00:00
displayInfoIdentifierSection.Add(displayConnector.ToString("G"));
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateProfileDisplayIdentifiers: Exception getting AMD Display Connector from video card to display. Substituting with a # instead");
displayInfoIdentifierSection.Add("#");
}
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
try
{
[WIP] Working nearly DisplayIds Have now go the required data, but for some reason AMD is returning two valid adapters when there is actually just one in the system! Could be a problem with the device installation, but I will need figuring out how to either remove duplicates, or figure out the information to use as a filter for ignoring one of the adapters.
2021-06-19 01:04:38 +00:00
displayInfoIdentifierSection.Add(oneDisplayInfo.DisplayName);
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
}
catch (Exception ex)
{
[WIP] Working nearly DisplayIds Have now go the required data, but for some reason AMD is returning two valid adapters when there is actually just one in the system! Could be a problem with the device installation, but I will need figuring out how to either remove duplicates, or figure out the information to use as a filter for ignoring one of the adapters.
2021-06-19 01:04:38 +00:00
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateProfileDisplayIdentifiers: Exception getting Display Name from display connected to AMD video card. Substituting with a # instead");
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
displayInfoIdentifierSection.Add("#");
}
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
try
{
[WIP] Working nearly DisplayIds Have now go the required data, but for some reason AMD is returning two valid adapters when there is actually just one in the system! Could be a problem with the device installation, but I will need figuring out how to either remove duplicates, or figure out the information to use as a filter for ignoring one of the adapters.
2021-06-19 01:04:38 +00:00
displayInfoIdentifierSection.Add(displayDDCInfo2.ManufacturerID.ToString());
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateProfileDisplayIdentifiers: Exception getting Manufacturer ID from display connected to AMD video card. Substituting with a # instead");
displayInfoIdentifierSection.Add("#");
}
try
{
displayInfoIdentifierSection.Add(displayDDCInfo2.ProductID.ToString());
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateProfileDisplayIdentifiers: Exception getting Product ID from display connected to AMD video card. Substituting with a # instead");
displayInfoIdentifierSection.Add("#");
}
try
{
displayInfoIdentifierSection.Add(displayDDCInfo2.SerialID.ToString());
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
}
catch (Exception ex)
{
[WIP] Working nearly DisplayIds Have now go the required data, but for some reason AMD is returning two valid adapters when there is actually just one in the system! Could be a problem with the device installation, but I will need figuring out how to either remove duplicates, or figure out the information to use as a filter for ignoring one of the adapters.
2021-06-19 01:04:38 +00:00
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateProfileDisplayIdentifiers: Exception getting Serial ID from display connected to AMD video card. Substituting with a # instead");
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
displayInfoIdentifierSection.Add("#");
}
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
// Create a display identifier out of it
string displayIdentifier = String.Join("|", displayInfoIdentifierSection);
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
// Check first to see if there is already an existing display identifier the same!
// This appears to be a bug with the AMD driver, or with the install on my test machine
// Either way, it is potentially going to happen in the wild, so I will filter it out if it does
if (displayIdentifiers.Contains(displayIdentifier))
{
SharedLogger.logger.Trace($"ADLWrapper/GenerateProfileDisplayIdentifiers: Your AMD driver reported the following Display Identifier multiple times, so ignoring it as we already have it: {displayIdentifier}");
continue;
}
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
// Add it to the list of display identifiers so we can return it
displayIdentifiers.Add(displayIdentifier);
SharedLogger.logger.Debug($"ProfileRepository/GenerateProfileDisplayIdentifiers: DisplayIdentifier: {displayIdentifier}");
}
}
catch (Exception ex)
{
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
SharedLogger.logger.Warn(ex, $"ProfileRepository/GenerateProfileDisplayIdentifiers: Exception caused trying to access attached displays");
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
continue;
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
}
}
else
{
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
SharedLogger.logger.Warn($"ADLWrapper/GenerateProfileDisplayIdentifiers: Error running ADL2_Display_DisplayInfo_Get on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
}
// Release the memory for the DisplayInfo structure
if (IntPtr.Zero != DisplayBuffer)
Marshal.FreeCoTaskMem(DisplayBuffer);
}
}
else
{
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
SharedLogger.logger.Warn($"ADLWrapper/GenerateProfileDisplayIdentifiers: Error running ADL2_Adapter_Active_Get on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
}
}
}
else
{
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
SharedLogger.logger.Warn($"ADLWrapper/GenerateProfileDisplayIdentifiers: Error running ADL2_Adapter_AdapterInfoX4_Get on AMD Video card: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
}
}
// Release the memory for the AdapterInfo structure
if (IntPtr.Zero != AdapterBuffer)
{
Marshal.FreeCoTaskMem(AdapterBuffer);
}
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
// Return all the identifiers we've found
return displayIdentifiers;
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
}
else
{
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
SharedLogger.logger.Warn($"ADLWrapper/GenerateProfileDisplayIdentifiers: There were no AMD adapters found by AMD ADL.");
[WIP] Learning about PInvoke This is a lot of learning about Pinvoke and the way to marshal c structures into c# managed structures when passed as out. This is all a lot more indepth than I was hoping it was going to be!
2021-06-15 09:55:15 +00:00
return null;
}
}
public List<string> GenerateAllAvailableDisplayIdentifiers()
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
{
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Getting AMD active adapter count");
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
int ADLRet = ADL.ADL_ERR;
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
int NumberOfAdapters = 0;
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
List<string> displayIdentifiers = new List<string>();
Correcting trace logging name
2021-06-19 07:42:54 +00:00
if (null != ADL.ADL2_Adapter_NumberOfAdapters_Get)
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
{
Correcting trace logging name
2021-06-19 07:42:54 +00:00
ADL.ADL2_Adapter_NumberOfAdapters_Get(_adlContextHandle, ref NumberOfAdapters);
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Number Of Adapters: {NumberOfAdapters.ToString()} ");
}
if (NumberOfAdapters > 0)
{
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
IntPtr AdapterBuffer = IntPtr.Zero;
if (ADL.ADL2_Adapter_AdapterInfoX4_Get != null)
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
{
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: ADL2_Adapter_AdapterInfoX4_Get DLL function exists.");
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
// Get the Adapter info and put it in the AdapterBuffer
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Running ADL2_Adapter_AdapterInfoX4_Get to find all known AMD adapters.");
//ADLRet = ADL.ADL2_Adapter_AdapterInfoX4_Get(_adlContextHandle, AdapterBuffer, size);
int numAdapters = 0;
ADLRet = ADL.ADL2_Adapter_AdapterInfoX4_Get(_adlContextHandle, ADL.ADL_ADAPTER_INDEX_ALL, out numAdapters, out AdapterBuffer);
if (ADLRet == ADL.ADL_OK)
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
{
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
int IsActive = ADL.ADL_TRUE; // We only want to search for active adapters
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Successfully run ADL2_Adapter_AdapterInfoX4_Get to find information about all known AMD adapters.");
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
ADLAdapterInfoX2 oneAdapter = new ADLAdapterInfoX2();
Correcting trace logging name
2021-06-19 07:42:54 +00:00
// Go through each adapter
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
for (int adapterLoop = 0; adapterLoop < numAdapters; adapterLoop++)
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
{
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
oneAdapter = (ADLAdapterInfoX2)Marshal.PtrToStructure(new IntPtr(AdapterBuffer.ToInt64() + (adapterLoop * Marshal.SizeOf(oneAdapter))), oneAdapter.GetType());
Correcting trace logging name
2021-06-19 07:42:54 +00:00
if (oneAdapter.Exist != 1)
{
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} doesn't exist at present so skipping detection for this adapter.");
Console.WriteLine($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} doesn't exist at present so skipping detection for this adapter.");
continue;
}
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
if (oneAdapter.Present != 1)
{
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} isn't enabled at present so skipping detection for this adapter.");
Console.WriteLine($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} isn't enabled at present so skipping detection for this adapter.");
continue;
}
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
// Check if the adapter is active
if (ADL.ADL2_Adapter_Active_Get != null)
ADLRet = ADL.ADL2_Adapter_Active_Get(_adlContextHandle, oneAdapter.AdapterIndex, ref IsActive);
if (ADLRet == ADL.ADL_OK)
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
{
Correcting trace logging name
2021-06-19 07:42:54 +00:00
// Only continue if the adapter is enabled
if (IsActive != ADL.ADL_TRUE)
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
{
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} isn't active ({oneAdapter.AdapterName}).");
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
continue;
}
Correcting trace logging name
2021-06-19 07:42:54 +00:00
// Only continue if the adapter index is > 0
if (oneAdapter.AdapterIndex < 0)
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
{
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: AMD Adapter has an adapter index of {oneAdapter.AdapterIndex.ToString()} which indicates it is not a real adapter.");
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
continue;
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
}
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} is active! ({oneAdapter.AdapterName}).");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: ### Adapter Info for Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter AdapterIndex = {oneAdapter.AdapterIndex}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter AdapterName = {oneAdapter.AdapterName}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter BusNumber = {oneAdapter.BusNumber}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter DeviceNumber = {oneAdapter.DeviceNumber}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter DisplayName = {oneAdapter.DisplayName}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter DriverPath = {oneAdapter.DriverPath}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter DriverPathExt = {oneAdapter.DriverPathExt}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter Exist = {oneAdapter.Exist}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter FunctionNumber = {oneAdapter.FunctionNumber}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter InfoMask = {oneAdapter.InfoMask}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter InfoValue = {oneAdapter.InfoValue}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter OSDisplayIndex = {oneAdapter.OSDisplayIndex}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter PNPString = {oneAdapter.PNPString}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter Present = {oneAdapter.Present}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter Size = {oneAdapter.Size}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter UDID = {oneAdapter.UDID}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter VendorID = {oneAdapter.VendorID}");
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
// Get the Adapter Capabilities
ADLAdapterCapsX2 AdapterCapabilities = new ADLAdapterCapsX2();
if (ADL.ADL2_AdapterX2_Caps != null)
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
{
Correcting trace logging name
2021-06-19 07:42:54 +00:00
ADLRet = ADL.ADL2_AdapterX2_Caps(_adlContextHandle, oneAdapter.AdapterIndex, out AdapterCapabilities);
}
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: ### Adapter Capabilities for Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter ID = {AdapterCapabilities.AdapterID}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter Capabilities Mask = {AdapterCapabilities.CapsMask}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter Capabilities Value = {AdapterCapabilities.CapsValue}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter Num of Connectors = {AdapterCapabilities.NumConnectors}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter Num of Controllers = {AdapterCapabilities.NumControllers}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter Num of Displays = {AdapterCapabilities.NumDisplays}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter Num of GL Sync Connectors = {AdapterCapabilities.NumOfGLSyncConnectors}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Adapter Num of Overlays = {AdapterCapabilities.NumOverlays}");
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
// Obtain information about displays
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
//ADLDisplayInfoArray displayInfoArray = new ADLDisplayInfoArray();
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
if (ADL.ADL2_Display_DisplayInfo_Get != null)
{
IntPtr DisplayBuffer = IntPtr.Zero;
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
int numDisplays = 0;
Correcting trace logging name
2021-06-19 07:42:54 +00:00
// Force the display detection and get the Display Info. Use 0 as last parameter to NOT force detection
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
ADLRet = ADL.ADL2_Display_DisplayInfo_Get(_adlContextHandle, oneAdapter.AdapterIndex, ref numDisplays, out DisplayBuffer, 0);
Correcting trace logging name
2021-06-19 07:42:54 +00:00
if (ADLRet == ADL.ADL_OK)
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
{
Correcting trace logging name
2021-06-19 07:42:54 +00:00
try
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
{
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
ADLDisplayInfo oneDisplayInfo = new ADLDisplayInfo();
[WIP] Working basic adapter detection Need to begin to put this in the right places....
2021-06-14 08:37:35 +00:00
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
for (int displayLoop = 0; displayLoop < numDisplays; displayLoop++)
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
{
Fix incorrect marshalling struct
2021-06-19 08:24:29 +00:00
oneDisplayInfo = (ADLDisplayInfo)Marshal.PtrToStructure(new IntPtr(DisplayBuffer.ToInt64() + (displayLoop * Marshal.SizeOf(oneDisplayInfo))), oneDisplayInfo.GetType());
[WIP] Working basic adapter detection Need to begin to put this in the right places....
2021-06-14 08:37:35 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
if (oneDisplayInfo.DisplayID.DisplayLogicalAdapterIndex == -1)
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
{
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} ({oneAdapter.AdapterName}) AdapterID display ID#{oneDisplayInfo.DisplayID.DisplayLogicalIndex} is not a real display as its DisplayID.DisplayLogicalAdapterIndex is -1");
continue;
}
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
// Convert the displayInfoValue to something usable using a library function I made
ConvertedDisplayInfoValue displayInfoValue = ADL.ConvertDisplayInfoValue(oneDisplayInfo.DisplayInfoValue);
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
if (!displayInfoValue.DISPLAYCONNECTED)
{
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} ({oneAdapter.AdapterName}) AdapterID display ID#{oneDisplayInfo.DisplayID.DisplayLogicalIndex} is not connected");
continue;
}
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
Changed marshalling to be more reliable
2021-06-19 08:19:29 +00:00
// We want connected displays whether they are mapped or not mapped in Windows OS
Added AMD ADL Exception handling
2021-06-19 07:39:50 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} ({oneAdapter.AdapterName}) AdapterID display ID#{oneDisplayInfo.DisplayID.DisplayLogicalIndex} is connected and mapped in Windows OS");
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
ADL.ADLDisplayConnectionType displayConnector = (ADL.ADLDisplayConnectionType)oneDisplayInfo.DisplayConnector;
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: ### Display Info for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Connector = {displayConnector.ToString("G")}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Controller Index = {oneDisplayInfo.DisplayControllerIndex}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Logical Adapter Index = {oneDisplayInfo.DisplayID.DisplayLogicalAdapterIndex}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Logical Index = {oneDisplayInfo.DisplayID.DisplayLogicalIndex}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Physical Adapter Index = {oneDisplayInfo.DisplayID.DisplayPhysicalAdapterIndex}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Physical Index = {oneDisplayInfo.DisplayID.DisplayPhysicalIndex}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Mask = {oneDisplayInfo.DisplayInfoMask}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value = {oneDisplayInfo.DisplayInfoValue}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Manufacturer Name = {oneDisplayInfo.DisplayManufacturerName}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Name = {oneDisplayInfo.DisplayName}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Output Type = {oneDisplayInfo.DisplayOutputType}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Type = {oneDisplayInfo.DisplayType}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value DISPLAYCONNECTED = {displayInfoValue.DISPLAYCONNECTED}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value DISPLAYMAPPED = {displayInfoValue.DISPLAYMAPPED}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value FORCIBLESUPPORTED = {displayInfoValue.FORCIBLESUPPORTED}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value GENLOCKSUPPORTED = {displayInfoValue.GENLOCKSUPPORTED}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value LDA_DISPLAY = {displayInfoValue.LDA_DISPLAY}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_2HSTRETCH = {displayInfoValue.MANNER_SUPPORTED_2HSTRETCH}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_2VSTRETCH = {displayInfoValue.MANNER_SUPPORTED_2VSTRETCH}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_CLONE = {displayInfoValue.MANNER_SUPPORTED_CLONE}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_EXTENDED = {displayInfoValue.MANNER_SUPPORTED_EXTENDED}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_NSTRETCH1GPU = {displayInfoValue.MANNER_SUPPORTED_NSTRETCH1GPU}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_NSTRETCHNGPU = {displayInfoValue.MANNER_SUPPORTED_NSTRETCHNGPU}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_SINGLE = {displayInfoValue.MANNER_SUPPORTED_SINGLE}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value MODETIMING_OVERRIDESSUPPORTED = {displayInfoValue.MODETIMING_OVERRIDESSUPPORTED}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value MULTIVPU_SUPPORTED = {displayInfoValue.MULTIVPU_SUPPORTED}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value NONLOCAL = {displayInfoValue.NONLOCAL}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Info Value SHOWTYPE_PROJECTOR = {displayInfoValue.SHOWTYPE_PROJECTOR}");
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
ADL.ADLDisplayConnectionType displayConnectionType = ADL.ADLDisplayConnectionType.Unknown;
ADLDisplayConfig displayConfig = new ADLDisplayConfig();
displayConfig.Size = Marshal.SizeOf(displayConfig);
if (ADL.ADL2_Display_DeviceConfig_Get != null)
{
// Get the DisplayConfig from the Display
ADLRet = ADL.ADL2_Display_DeviceConfig_Get(_adlContextHandle, oneAdapter.AdapterIndex, oneDisplayInfo.DisplayID.DisplayPhysicalIndex, out displayConfig);
if (ADLRet == ADL.ADL_OK)
Added AMD ADL Exception handling
2021-06-19 07:39:50 +00:00
{
Correcting trace logging name
2021-06-19 07:42:54 +00:00
displayConnectionType = (ADL.ADLDisplayConnectionType)displayConfig.ConnectorType;
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: ### Display Device Config for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Connector Type = {displayConnectionType.ToString("G")}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Device Data = {displayConfig.DeviceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Overridded Device Data = {displayConfig.OverriddedDeviceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Reserved Data = {displayConfig.Reserved}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Size = {displayConfig.Size}");
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
}
Correcting trace logging name
2021-06-19 07:42:54 +00:00
else
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
{
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Warn($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Error running ADL2_Display_DeviceConfig_Get on Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
}
Correcting trace logging name
2021-06-19 07:42:54 +00:00
}
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
ADLDDCInfo2 displayDDCInfo2 = new ADLDDCInfo2();
displayDDCInfo2.Size = Marshal.SizeOf(displayDDCInfo2);
// Create a stringbuilder buffer that EDID can be loaded into
//displayEDIDData.EDIDData = new StringBuilder(256);
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
if (ADL.ADL2_Display_DDCInfo2_Get != null)
{
// Get the DDC Data from the Display
ADLRet = ADL.ADL2_Display_DDCInfo2_Get(_adlContextHandle, oneAdapter.AdapterIndex, oneDisplayInfo.DisplayID.DisplayPhysicalIndex, out displayDDCInfo2);
if (ADLRet == ADL.ADL_OK)
Added AMD ADL Exception handling
2021-06-19 07:39:50 +00:00
{
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
// Convert the DDCInfoFlag to something usable using a library function I made
ConvertedDDCInfoFlag DDCInfoFlag = ADL.ConvertDDCInfoFlag(displayDDCInfo2.DDCInfoFlag);
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
// Convert the DDCInfoFlag to something usable using a library function I made
ConvertedSupportedHDR supportedHDR = ADL.ConvertSupportedHDR(displayDDCInfo2.SupportedHDR);
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: ### Display DDCInfo2 for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display AvgLuminanceData = {displayDDCInfo2.AvgLuminanceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display DDCInfoFlag = {displayDDCInfo2.DDCInfoFlag}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display DiffuseScreenReflectance = {displayDDCInfo2.DiffuseScreenReflectance}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display DisplayName = {displayDDCInfo2.DisplayName}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display FreesyncFlags = {displayDDCInfo2.FreesyncFlags}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display ManufacturerID = {displayDDCInfo2.ManufacturerID}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display MaxBacklightMaxLuminanceData = {displayDDCInfo2.MaxBacklightMaxLuminanceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display MaxBacklightMinLuminanceData = {displayDDCInfo2.MaxBacklightMinLuminanceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display MaxHResolution = {displayDDCInfo2.MaxHResolution}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display MaxLuminanceData = {displayDDCInfo2.MaxLuminanceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display MaxRefresh = {displayDDCInfo2.MaxRefresh}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display MaxVResolution = {displayDDCInfo2.MaxVResolution}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display MinBacklightMaxLuminanceData = {displayDDCInfo2.MinBacklightMaxLuminanceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display MinBacklightMinLuminanceData = {displayDDCInfo2.MinBacklightMinLuminanceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display MinLuminanceData = {displayDDCInfo2.MinLuminanceData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display MinLuminanceNoDimmingData = {displayDDCInfo2.MinLuminanceNoDimmingData}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display NativeDisplayChromaticityBlueX = {displayDDCInfo2.NativeDisplayChromaticityBlueX}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display NativeDisplayChromaticityBlueY = {displayDDCInfo2.NativeDisplayChromaticityBlueY}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display NativeDisplayChromaticityGreenX = {displayDDCInfo2.NativeDisplayChromaticityGreenX}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display NativeDisplayChromaticityGreenY = {displayDDCInfo2.NativeDisplayChromaticityGreenY}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display NativeDisplayChromaticityRedX = {displayDDCInfo2.NativeDisplayChromaticityRedX}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display NativeDisplayChromaticityRedY = {displayDDCInfo2.NativeDisplayChromaticityRedY}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display NativeDisplayChromaticityWhiteX = {displayDDCInfo2.NativeDisplayChromaticityWhiteX}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display NativeDisplayChromaticityWhiteY = {displayDDCInfo2.NativeDisplayChromaticityWhiteY}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display PackedPixelSupported = {displayDDCInfo2.PackedPixelSupported}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display PanelPixelFormat = {displayDDCInfo2.PanelPixelFormat}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display ProductID = {displayDDCInfo2.ProductID}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display PTMCx = {displayDDCInfo2.PTMCx}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display PTMCy = {displayDDCInfo2.PTMCy}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display PTMRefreshRate = {displayDDCInfo2.PTMRefreshRate}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display SerialID = {displayDDCInfo2.SerialID}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display Size = {displayDDCInfo2.Size}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display SpecularScreenReflectance = {displayDDCInfo2.SpecularScreenReflectance}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display SupportedColorSpace = {displayDDCInfo2.SupportedColorSpace}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display SupportedHDR = {displayDDCInfo2.SupportedHDR}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display SupportedTransferFunction = {displayDDCInfo2.SupportedTransferFunction}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display SupportsDDC = {displayDDCInfo2.SupportsDDC}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display DDCInfoFlag Digital Device = {DDCInfoFlag.DIGITALDEVICE}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display DDCInfoFlag EDID Extension = {DDCInfoFlag.EDIDEXTENSION}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display DDCInfoFlag HDMI Audio Device = {DDCInfoFlag.HDMIAUDIODEVICE}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display DDCInfoFlag Projector Device = {DDCInfoFlag.PROJECTORDEVICE}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display DDCInfoFlag Supports AI = {DDCInfoFlag.SUPPORTS_AI}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display DDCInfoFlag Supports xvYCC601 = {DDCInfoFlag.SUPPORT_xvYCC601}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display DDCInfoFlag Supports xvYCC709 = {DDCInfoFlag.SUPPORT_xvYCC709}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display SupportedHDR Supports CEA861_3 = {supportedHDR.CEA861_3}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display SupportedHDR Supports DOLBYVISION = {supportedHDR.DOLBYVISION}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display SupportedHDR Supports FREESYNC_HDR = {supportedHDR.FREESYNC_HDR}");
Added AMD ADL Exception handling
2021-06-19 07:39:50 +00:00
}
Correcting trace logging name
2021-06-19 07:42:54 +00:00
else
Added AMD ADL Exception handling
2021-06-19 07:39:50 +00:00
{
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Warn($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Error running ADL2_Display_DDCInfo2_Get on Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
Added AMD ADL Exception handling
2021-06-19 07:39:50 +00:00
}
Correcting trace logging name
2021-06-19 07:42:54 +00:00
}
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
int HDRSupported = 0;
int HDREnabled = 0;
if (ADL.ADL2_Display_HDRState_Get != null)
{
// Get the HDR State from the Display
ADLRet = ADL.ADL2_Display_HDRState_Get(_adlContextHandle, oneAdapter.AdapterIndex, oneDisplayInfo.DisplayID, out HDRSupported, out HDREnabled);
if (ADLRet == ADL.ADL_OK)
Added AMD ADL Exception handling
2021-06-19 07:39:50 +00:00
{
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: ### Display HDR State for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display HDR Supported = {HDRSupported}");
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Display HDR Enabled = {HDREnabled}");
Added AMD ADL Exception handling
2021-06-19 07:39:50 +00:00
}
Correcting trace logging name
2021-06-19 07:42:54 +00:00
else
Added AMD ADL Exception handling
2021-06-19 07:39:50 +00:00
{
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Warn($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Error running ADL2_Display_HDRState_Get on Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
Added AMD ADL Exception handling
2021-06-19 07:39:50 +00:00
}
Correcting trace logging name
2021-06-19 07:42:54 +00:00
}
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
// Create an array of all the important display info we need to record
List<string> displayInfoIdentifierSection = new List<string>();
displayInfoIdentifierSection.Add("AMD");
try
{
displayInfoIdentifierSection.Add(oneAdapter.VendorID.ToString());
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Exception getting AMD Vendor ID from video card. Substituting with a # instead");
displayInfoIdentifierSection.Add("#");
}
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
try
{
displayInfoIdentifierSection.Add(oneAdapter.AdapterName);
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Exception getting AMD Adapter Name from video card. Substituting with a # instead");
displayInfoIdentifierSection.Add("#");
}
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
try
{
displayInfoIdentifierSection.Add(oneAdapter.VendorID.ToString());
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Exception getting AMD VendorID from video card. Substituting with a # instead");
displayInfoIdentifierSection.Add("1002");
}
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
try
{
displayInfoIdentifierSection.Add(AdapterCapabilities.AdapterID.ToString());
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Exception getting AMD AdapterID from video card. Substituting with a # instead");
displayInfoIdentifierSection.Add("#");
}
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
Correcting trace logging name
2021-06-19 07:42:54 +00:00
try
{
displayInfoIdentifierSection.Add(displayConnector.ToString("G"));
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
}
Correcting trace logging name
2021-06-19 07:42:54 +00:00
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Exception getting AMD Display Connector from video card to display. Substituting with a # instead");
displayInfoIdentifierSection.Add("#");
}
try
{
displayInfoIdentifierSection.Add(oneDisplayInfo.DisplayName);
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Exception getting Display Name from display connected to AMD video card. Substituting with a # instead");
displayInfoIdentifierSection.Add("#");
}
try
{
displayInfoIdentifierSection.Add(displayDDCInfo2.ManufacturerID.ToString());
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Exception getting Manufacturer ID from display connected to AMD video card. Substituting with a # instead");
displayInfoIdentifierSection.Add("#");
}
try
{
displayInfoIdentifierSection.Add(displayDDCInfo2.ProductID.ToString());
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Exception getting Product ID from display connected to AMD video card. Substituting with a # instead");
displayInfoIdentifierSection.Add("#");
}
try
{
displayInfoIdentifierSection.Add(displayDDCInfo2.SerialID.ToString());
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Exception getting Serial ID from display connected to AMD video card. Substituting with a # instead");
displayInfoIdentifierSection.Add("#");
}
// Create a display identifier out of it
string displayIdentifier = String.Join("|", displayInfoIdentifierSection);
// Check first to see if there is already an existing display identifier the same!
// This appears to be a bug with the AMD driver, or with the install on my test machine
// Either way, it is potentially going to happen in the wild, so I will filter it out if it does
if (displayIdentifiers.Contains(displayIdentifier))
{
SharedLogger.logger.Trace($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Your AMD driver reported the following Display Identifier multiple times, so ignoring it as we already have it: {displayIdentifier}");
continue;
}
// Add it to the list of display identifiers so we can return it
displayIdentifiers.Add(displayIdentifier);
SharedLogger.logger.Debug($"ProfileRepository/GenerateAllAvailableDisplayIdentifiers: DisplayIdentifier: {displayIdentifier}");
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
}
}
Correcting trace logging name
2021-06-19 07:42:54 +00:00
catch (Exception ex)
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
{
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Warn(ex, $"ProfileRepository/GenerateAllAvailableDisplayIdentifiers: Exception caused trying to access attached displays");
continue;
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
}
}
Correcting trace logging name
2021-06-19 07:42:54 +00:00
else
{
SharedLogger.logger.Warn($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Error running ADL2_Display_DisplayInfo_Get on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
}
// Release the memory for the DisplayInfo structure
if (IntPtr.Zero != DisplayBuffer)
Marshal.FreeCoTaskMem(DisplayBuffer);
Added AMD ADL Exception handling
2021-06-19 07:39:50 +00:00
}
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
}
Correcting trace logging name
2021-06-19 07:42:54 +00:00
else
{
SharedLogger.logger.Warn($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Error running ADL2_Adapter_Active_Get on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
}
Added AMD ADL Exception handling
2021-06-19 07:39:50 +00:00
}
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
}
Correcting trace logging name
2021-06-19 07:42:54 +00:00
else
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
{
Correcting trace logging name
2021-06-19 07:42:54 +00:00
SharedLogger.logger.Warn($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: Error running ADL2_Adapter_AdapterInfoX4_Get on AMD Video card: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
Partially working displayids It needs to be fixed as it isn't getting the underlying displays when eyefinity is turned on. Need to find a way around that
2021-06-17 06:51:48 +00:00
}
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
}
Added AMD ADL Exception handling
2021-06-19 07:39:50 +00:00
// Release the memory for the AdapterInfo structure
Correcting trace logging name
2021-06-19 07:42:54 +00:00
if (IntPtr.Zero != AdapterBuffer)
Added AMD ADL Exception handling
2021-06-19 07:39:50 +00:00
{
Marshal.FreeCoTaskMem(AdapterBuffer);
}
Correcting trace logging name
2021-06-19 07:42:54 +00:00
// Return all the identifiers we've found
return displayIdentifiers;
}
else
{
SharedLogger.logger.Warn($"ADLWrapper/GenerateAllAvailableDisplayIdentifiers: There were no AMD adapters found by AMD ADL.");
[WIP] Building AMD library functions There is a long road ahead of me, but at least some of the structure is working now! We can at least call the AMD ADL library and get results returned back!
2021-06-14 09:42:16 +00:00
return null;
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
}
}
}
}
Reference in New Issue Copy Permalink