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
33bf28149e
DisplayMagician/DisplayMagicianShared/AMD/AMDLibrary.cs

1746 lines
163 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.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;
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
namespace DisplayMagicianShared.AMD
{
[WIP] Initial ProfileItem split into libraries This is part of the new strategy to split the ProfileItems into different derived clases with one per Video card technology. The purpose is to allow each video card driver to produce a slightly different profiledata section which is customised to the needs of that video card. This will allieviate the need for us to extend the Path object to support AMD, as we'll be doing the differentiation at each ProfileItem. Time will tell if this is a better strategy or not. This is all to do with my even longer term strategy of devloping video card driver library files inhouse. This strategy was directly created just so that I can make changes in my own code if I need to support some additional features such as HDR support within the profiles. It is very difficult to do this if I'm using another video card library. Much more simple to update my own code!
2021-06-22 09:05:24 +00:00
public class AMDLibrary : 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
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
private static AMDLibrary _instance = new AMDLibrary();
[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;
// To detect redundant calls
private bool _disposed = false;
// Instantiate a SafeHandle instance.
private SafeHandle _safeHandle = new SafeFileHandle(IntPtr.Zero, true);
[WIP] Initial ProfileItem split into libraries This is part of the new strategy to split the ProfileItems into different derived clases with one per Video card technology. The purpose is to allow each video card driver to produce a slightly different profiledata section which is customised to the needs of that video card. This will allieviate the need for us to extend the Path object to support AMD, as we'll be doing the differentiation at each ProfileItem. Time will tell if this is a better strategy or not. This is all to do with my even longer term strategy of devloping video card driver library files inhouse. This strategy was directly created just so that I can make changes in my own code if I need to support some additional features such as HDR support within the profiles. It is very difficult to do this if I'm using another video card library. Much more simple to update my own code!
2021-06-22 09:05:24 +00:00
private IntPtr _adlContextHandle = IntPtr.Zero;
[WIP] Basic working DisplayProfile writing and reading Now have the DisplayProfile storing the minimal set of data that it needs. It also recreates the Screens list (used for creating profile bitmaps and icons) and recreates the DisplayProfileBitmaps each time at present. I will add some logic to deerialise the bitmaps again at a later date once I've compeleted actually applying the AMD display confs.
2021-06-27 01:53:00 +00:00
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
static AMDLibrary() { }
public AMDLibrary()
[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
int ADLRet = ADL.ADL_ERR;
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
SharedLogger.logger.Trace("AMDLibrary/AMDLibrary: Intialising ADL2 library interface");
[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)
{
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
_initialised = true;
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace("AMDLibrary/AMDLibrary: ADL2 library was initialised successfully");
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
}
else
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Error("AMDLibrary/AMDLibrary: Error intialising ADL2 library. ADL2_Main_Control_Create() returned error code " + ADL.ConvertADLReturnValueIntoWords(ADLRet));
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
}
}
catch (Exception ex)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Error(ex, "AMDLibrary/AMDLibrary: 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
}
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
~AMDLibrary()
[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
// If the ADL2 library was initialised, then we need to free it up.
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
if (_initialised)
[WIP] Partial migration to ADL2 Its the only way to get HDR information :(
2021-06-18 00:33:46 +00:00
{
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
{
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
get { return _initialised; }
[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
}
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
public static AMDLibrary GetLibrary()
[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 _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()
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Getting AMD active adapter count");
[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
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);
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Number Of Adapters: {NumberOfAdapters.ToString()} ");
[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
}
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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/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
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/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
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} doesn't exist at present so skipping detection for this adapter.");
[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
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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} isn't enabled at present so skipping detection for this adapter.");
[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
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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} isn't active ({oneAdapter.AdapterName}).");
[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
continue;
}
// Only continue if the adapter index is > 0
if (oneAdapter.AdapterIndex < 0)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/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;
}
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} is active! ({oneAdapter.AdapterName}).");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: ### Adapter Info for Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter AdapterIndex = {oneAdapter.AdapterIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter AdapterName = {oneAdapter.AdapterName}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter BusNumber = {oneAdapter.BusNumber}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter DeviceNumber = {oneAdapter.DeviceNumber}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter DisplayName = {oneAdapter.DisplayName}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter DriverPath = {oneAdapter.DriverPath}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter DriverPathExt = {oneAdapter.DriverPathExt}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter Exist = {oneAdapter.Exist}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter FunctionNumber = {oneAdapter.FunctionNumber}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter InfoMask = {oneAdapter.InfoMask}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter InfoValue = {oneAdapter.InfoValue}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter OSDisplayIndex = {oneAdapter.OSDisplayIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter PNPString = {oneAdapter.PNPString}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter Present = {oneAdapter.Present}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter Size = {oneAdapter.Size}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter UDID = {oneAdapter.UDID}");
SharedLogger.logger.Trace($"AMDLibrary/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
}
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: ### Adapter Capabilities for Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter ID = {AdapterCapabilities.AdapterID}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter Capabilities Mask = {AdapterCapabilities.CapsMask}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter Capabilities Value = {AdapterCapabilities.CapsValue}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter Num of Connectors = {AdapterCapabilities.NumConnectors}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter Num of Controllers = {AdapterCapabilities.NumControllers}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter Num of Displays = {AdapterCapabilities.NumDisplays}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Adapter Num of GL Sync Connectors = {AdapterCapabilities.NumOfGLSyncConnectors}");
SharedLogger.logger.Trace($"AMDLibrary/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
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
// Is the display mapped to this adapter? If not we skip it!
if (oneDisplayInfo.DisplayID.DisplayLogicalAdapterIndex != oneAdapter.AdapterIndex)
[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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/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
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} ({oneAdapter.AdapterName}) AdapterID display ID#{oneDisplayInfo.DisplayID.DisplayLogicalIndex} is connected and mapped in Windows OS");
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +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 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
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: ### Display Info for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Connector = {displayConnector.ToString("G")}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Controller Index = {oneDisplayInfo.DisplayControllerIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Logical Adapter Index = {oneDisplayInfo.DisplayID.DisplayLogicalAdapterIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Logical Index = {oneDisplayInfo.DisplayID.DisplayLogicalIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Physical Adapter Index = {oneDisplayInfo.DisplayID.DisplayPhysicalAdapterIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Physical Index = {oneDisplayInfo.DisplayID.DisplayPhysicalIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Mask = {oneDisplayInfo.DisplayInfoMask}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Value = {oneDisplayInfo.DisplayInfoValue}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Manufacturer Name = {oneDisplayInfo.DisplayManufacturerName}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Name = {oneDisplayInfo.DisplayName}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Output Type = {oneDisplayInfo.DisplayOutputType}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Type = {oneDisplayInfo.DisplayType}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Value DISPLAYCONNECTED = {displayInfoValue.DISPLAYCONNECTED}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Value DISPLAYMAPPED = {displayInfoValue.DISPLAYMAPPED}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Value FORCIBLESUPPORTED = {displayInfoValue.FORCIBLESUPPORTED}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Value GENLOCKSUPPORTED = {displayInfoValue.GENLOCKSUPPORTED}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Value LDA_DISPLAY = {displayInfoValue.LDA_DISPLAY}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_2HSTRETCH = {displayInfoValue.MANNER_SUPPORTED_2HSTRETCH}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_2VSTRETCH = {displayInfoValue.MANNER_SUPPORTED_2VSTRETCH}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_CLONE = {displayInfoValue.MANNER_SUPPORTED_CLONE}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_EXTENDED = {displayInfoValue.MANNER_SUPPORTED_EXTENDED}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_NSTRETCH1GPU = {displayInfoValue.MANNER_SUPPORTED_NSTRETCH1GPU}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_NSTRETCHNGPU = {displayInfoValue.MANNER_SUPPORTED_NSTRETCHNGPU}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_SINGLE = {displayInfoValue.MANNER_SUPPORTED_SINGLE}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Value MODETIMING_OVERRIDESSUPPORTED = {displayInfoValue.MODETIMING_OVERRIDESSUPPORTED}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Value MULTIVPU_SUPPORTED = {displayInfoValue.MULTIVPU_SUPPORTED}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Info Value NONLOCAL = {displayInfoValue.NONLOCAL}");
SharedLogger.logger.Trace($"AMDLibrary/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;
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: ### Display Device Config for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Connector Type = {displayConnectionType.ToString("G")}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Device Data = {displayConfig.DeviceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Overridded Device Data = {displayConfig.OverriddedDeviceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Reserved Data = {displayConfig.Reserved}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Size = {displayConfig.Size}");
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
}
else
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn($"AMDLibrary/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
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: ### Display DDCInfo2 for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display AvgLuminanceData = {displayDDCInfo2.AvgLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display DDCInfoFlag = {displayDDCInfo2.DDCInfoFlag}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display DiffuseScreenReflectance = {displayDDCInfo2.DiffuseScreenReflectance}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display DisplayName = {displayDDCInfo2.DisplayName}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display FreesyncFlags = {displayDDCInfo2.FreesyncFlags}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display ManufacturerID = {displayDDCInfo2.ManufacturerID}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display MaxBacklightMaxLuminanceData = {displayDDCInfo2.MaxBacklightMaxLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display MaxBacklightMinLuminanceData = {displayDDCInfo2.MaxBacklightMinLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display MaxHResolution = {displayDDCInfo2.MaxHResolution}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display MaxLuminanceData = {displayDDCInfo2.MaxLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display MaxRefresh = {displayDDCInfo2.MaxRefresh}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display MaxVResolution = {displayDDCInfo2.MaxVResolution}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display MinBacklightMaxLuminanceData = {displayDDCInfo2.MinBacklightMaxLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display MinBacklightMinLuminanceData = {displayDDCInfo2.MinBacklightMinLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display MinLuminanceData = {displayDDCInfo2.MinLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display MinLuminanceNoDimmingData = {displayDDCInfo2.MinLuminanceNoDimmingData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display NativeDisplayChromaticityBlueX = {displayDDCInfo2.NativeDisplayChromaticityBlueX}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display NativeDisplayChromaticityBlueY = {displayDDCInfo2.NativeDisplayChromaticityBlueY}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display NativeDisplayChromaticityGreenX = {displayDDCInfo2.NativeDisplayChromaticityGreenX}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display NativeDisplayChromaticityGreenY = {displayDDCInfo2.NativeDisplayChromaticityGreenY}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display NativeDisplayChromaticityRedX = {displayDDCInfo2.NativeDisplayChromaticityRedX}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display NativeDisplayChromaticityRedY = {displayDDCInfo2.NativeDisplayChromaticityRedY}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display NativeDisplayChromaticityWhiteX = {displayDDCInfo2.NativeDisplayChromaticityWhiteX}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display NativeDisplayChromaticityWhiteY = {displayDDCInfo2.NativeDisplayChromaticityWhiteY}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display PackedPixelSupported = {displayDDCInfo2.PackedPixelSupported}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display PanelPixelFormat = {displayDDCInfo2.PanelPixelFormat}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display ProductID = {displayDDCInfo2.ProductID}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display PTMCx = {displayDDCInfo2.PTMCx}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display PTMCy = {displayDDCInfo2.PTMCy}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display PTMRefreshRate = {displayDDCInfo2.PTMRefreshRate}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display SerialID = {displayDDCInfo2.SerialID}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display Size = {displayDDCInfo2.Size}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display SpecularScreenReflectance = {displayDDCInfo2.SpecularScreenReflectance}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display SupportedColorSpace = {displayDDCInfo2.SupportedColorSpace}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display SupportedHDR = {displayDDCInfo2.SupportedHDR}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display SupportedTransferFunction = {displayDDCInfo2.SupportedTransferFunction}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display SupportsDDC = {displayDDCInfo2.SupportsDDC}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display DDCInfoFlag Digital Device = {DDCInfoFlag.DIGITALDEVICE}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display DDCInfoFlag EDID Extension = {DDCInfoFlag.EDIDEXTENSION}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display DDCInfoFlag HDMI Audio Device = {DDCInfoFlag.HDMIAUDIODEVICE}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display DDCInfoFlag Projector Device = {DDCInfoFlag.PROJECTORDEVICE}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display DDCInfoFlag Supports AI = {DDCInfoFlag.SUPPORTS_AI}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display DDCInfoFlag Supports xvYCC601 = {DDCInfoFlag.SUPPORT_xvYCC601}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display DDCInfoFlag Supports xvYCC709 = {DDCInfoFlag.SUPPORT_xvYCC709}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display SupportedHDR Supports CEA861_3 = {supportedHDR.CEA861_3}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display SupportedHDR Supports DOLBYVISION = {supportedHDR.DOLBYVISION}");
SharedLogger.logger.Trace($"AMDLibrary/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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn($"AMDLibrary/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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: ### Display HDR State for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display HDR Supported = {HDRSupported}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Display HDR Enabled = {HDREnabled}");
Added trace logging to ADLWrapper
2021-06-19 07:31:25 +00:00
}
else
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn($"AMDLibrary/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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/GenerateProfileDisplayIdentifiers: Exception getting AMD Vendor ID from video card. Substituting with a # instead");
[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("#");
}
[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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/GenerateProfileDisplayIdentifiers: Exception getting AMD Adapter Name from 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("#");
}
[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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/GenerateProfileDisplayIdentifiers: Exception getting AMD VendorID from 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("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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/GenerateProfileDisplayIdentifiers: Exception getting AMD AdapterID from 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] 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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/GenerateProfileDisplayIdentifiers: Exception getting AMD Display Connector from video card to display. 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(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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/GenerateProfileDisplayIdentifiers: Exception getting Manufacturer ID from display connected to AMD video card. Substituting with a # instead");
[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("#");
}
try
{
displayInfoIdentifierSection.Add(displayDDCInfo2.ProductID.ToString());
}
catch (Exception ex)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/GenerateProfileDisplayIdentifiers: Exception getting Product ID from display connected to AMD video card. Substituting with a # instead");
[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("#");
}
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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/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))
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateProfileDisplayIdentifiers: Your AMD driver reported the following Display Identifier multiple times, so ignoring it as we already have it: {displayIdentifier}");
[WIP] Additional dispId generation tweaks
2021-06-19 01:36:57 +00:00
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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn($"AMDLibrary/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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn($"AMDLibrary/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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn($"AMDLibrary/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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn($"AMDLibrary/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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/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);
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Number Of Adapters: {NumberOfAdapters.ToString()} ");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
}
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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/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
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Running ADL2_Adapter_AdapterInfoX4_Get to find all known AMD adapters.");
Correcting trace logging name
2021-06-19 07:42:54 +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);
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
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Successfully run ADL2_Adapter_AdapterInfoX4_Get to find information about all known AMD adapters.");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} doesn't exist at present so skipping detection for this adapter.");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} isn't enabled at present so skipping detection for this adapter.");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/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
}
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} is active! ({oneAdapter.AdapterName}).");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: ### Adapter Info for Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter AdapterIndex = {oneAdapter.AdapterIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter AdapterName = {oneAdapter.AdapterName}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter BusNumber = {oneAdapter.BusNumber}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter DeviceNumber = {oneAdapter.DeviceNumber}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter DisplayName = {oneAdapter.DisplayName}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter DriverPath = {oneAdapter.DriverPath}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter DriverPathExt = {oneAdapter.DriverPathExt}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter Exist = {oneAdapter.Exist}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter FunctionNumber = {oneAdapter.FunctionNumber}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter InfoMask = {oneAdapter.InfoMask}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter InfoValue = {oneAdapter.InfoValue}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter OSDisplayIndex = {oneAdapter.OSDisplayIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter PNPString = {oneAdapter.PNPString}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter Present = {oneAdapter.Present}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter Size = {oneAdapter.Size}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter UDID = {oneAdapter.UDID}");
SharedLogger.logger.Trace($"AMDLibrary/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
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: ### Adapter Capabilities for Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter ID = {AdapterCapabilities.AdapterID}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter Capabilities Mask = {AdapterCapabilities.CapsMask}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter Capabilities Value = {AdapterCapabilities.CapsValue}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter Num of Connectors = {AdapterCapabilities.NumConnectors}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter Num of Controllers = {AdapterCapabilities.NumControllers}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter Num of Displays = {AdapterCapabilities.NumDisplays}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Adapter Num of GL Sync Connectors = {AdapterCapabilities.NumOfGLSyncConnectors}");
SharedLogger.logger.Trace($"AMDLibrary/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
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
Finally detecting connectable displays I finally figured out how to check for displays that are selectable, but aren't in use. It's not as striaght forward with AMD ASL library as it is with NVIDIA's driver, thats for sure. Seem to have fixed the exceptions based on all the testing I've been doing. So there is at least that!
2021-06-19 08:39:58 +00:00
ADLRet = ADL.ADL2_Display_DisplayInfo_Get(_adlContextHandle, oneAdapter.AdapterIndex, ref numDisplays, out DisplayBuffer, 1);
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
{
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
oneDisplayInfo = (ADLDisplayInfo)Marshal.PtrToStructure(new IntPtr(DisplayBuffer.ToInt64() + (displayLoop * Marshal.SizeOf(oneDisplayInfo))), oneDisplayInfo.GetType());
// Is the display mapped to this adapter? If not we skip it!
if (oneDisplayInfo.DisplayID.DisplayLogicalAdapterIndex != oneAdapter.AdapterIndex)
{
SharedLogger.logger.Trace($"AMDLibrary/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
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
// Is the display mapped to this adapter? If not we skip it!
Correcting trace logging name
2021-06-19 07:42:54 +00:00
if (!displayInfoValue.DISPLAYCONNECTED)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} ({oneAdapter.AdapterName}) AdapterID display ID#{oneDisplayInfo.DisplayID.DisplayLogicalIndex} is not connected");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
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
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/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
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: ### Display Info for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Connector = {displayConnector.ToString("G")}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Controller Index = {oneDisplayInfo.DisplayControllerIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Logical Adapter Index = {oneDisplayInfo.DisplayID.DisplayLogicalAdapterIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Logical Index = {oneDisplayInfo.DisplayID.DisplayLogicalIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Physical Adapter Index = {oneDisplayInfo.DisplayID.DisplayPhysicalAdapterIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Physical Index = {oneDisplayInfo.DisplayID.DisplayPhysicalIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Mask = {oneDisplayInfo.DisplayInfoMask}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Value = {oneDisplayInfo.DisplayInfoValue}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Manufacturer Name = {oneDisplayInfo.DisplayManufacturerName}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Name = {oneDisplayInfo.DisplayName}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Output Type = {oneDisplayInfo.DisplayOutputType}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Type = {oneDisplayInfo.DisplayType}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Value DISPLAYCONNECTED = {displayInfoValue.DISPLAYCONNECTED}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Value DISPLAYMAPPED = {displayInfoValue.DISPLAYMAPPED}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Value FORCIBLESUPPORTED = {displayInfoValue.FORCIBLESUPPORTED}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Value GENLOCKSUPPORTED = {displayInfoValue.GENLOCKSUPPORTED}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Value LDA_DISPLAY = {displayInfoValue.LDA_DISPLAY}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_2HSTRETCH = {displayInfoValue.MANNER_SUPPORTED_2HSTRETCH}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_2VSTRETCH = {displayInfoValue.MANNER_SUPPORTED_2VSTRETCH}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_CLONE = {displayInfoValue.MANNER_SUPPORTED_CLONE}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_EXTENDED = {displayInfoValue.MANNER_SUPPORTED_EXTENDED}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_NSTRETCH1GPU = {displayInfoValue.MANNER_SUPPORTED_NSTRETCH1GPU}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_NSTRETCHNGPU = {displayInfoValue.MANNER_SUPPORTED_NSTRETCHNGPU}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Value MANNER_SUPPORTED_SINGLE = {displayInfoValue.MANNER_SUPPORTED_SINGLE}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Value MODETIMING_OVERRIDESSUPPORTED = {displayInfoValue.MODETIMING_OVERRIDESSUPPORTED}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Value MULTIVPU_SUPPORTED = {displayInfoValue.MULTIVPU_SUPPORTED}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Info Value NONLOCAL = {displayInfoValue.NONLOCAL}");
SharedLogger.logger.Trace($"AMDLibrary/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
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: ### Display Device Config for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Connector Type = {displayConnectionType.ToString("G")}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Device Data = {displayConfig.DeviceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Overridded Device Data = {displayConfig.OverriddedDeviceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Reserved Data = {displayConfig.Reserved}");
SharedLogger.logger.Trace($"AMDLibrary/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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn($"AMDLibrary/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
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: ### Display DDCInfo2 for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display AvgLuminanceData = {displayDDCInfo2.AvgLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display DDCInfoFlag = {displayDDCInfo2.DDCInfoFlag}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display DiffuseScreenReflectance = {displayDDCInfo2.DiffuseScreenReflectance}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display DisplayName = {displayDDCInfo2.DisplayName}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display FreesyncFlags = {displayDDCInfo2.FreesyncFlags}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display ManufacturerID = {displayDDCInfo2.ManufacturerID}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display MaxBacklightMaxLuminanceData = {displayDDCInfo2.MaxBacklightMaxLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display MaxBacklightMinLuminanceData = {displayDDCInfo2.MaxBacklightMinLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display MaxHResolution = {displayDDCInfo2.MaxHResolution}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display MaxLuminanceData = {displayDDCInfo2.MaxLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display MaxRefresh = {displayDDCInfo2.MaxRefresh}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display MaxVResolution = {displayDDCInfo2.MaxVResolution}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display MinBacklightMaxLuminanceData = {displayDDCInfo2.MinBacklightMaxLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display MinBacklightMinLuminanceData = {displayDDCInfo2.MinBacklightMinLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display MinLuminanceData = {displayDDCInfo2.MinLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display MinLuminanceNoDimmingData = {displayDDCInfo2.MinLuminanceNoDimmingData}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display NativeDisplayChromaticityBlueX = {displayDDCInfo2.NativeDisplayChromaticityBlueX}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display NativeDisplayChromaticityBlueY = {displayDDCInfo2.NativeDisplayChromaticityBlueY}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display NativeDisplayChromaticityGreenX = {displayDDCInfo2.NativeDisplayChromaticityGreenX}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display NativeDisplayChromaticityGreenY = {displayDDCInfo2.NativeDisplayChromaticityGreenY}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display NativeDisplayChromaticityRedX = {displayDDCInfo2.NativeDisplayChromaticityRedX}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display NativeDisplayChromaticityRedY = {displayDDCInfo2.NativeDisplayChromaticityRedY}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display NativeDisplayChromaticityWhiteX = {displayDDCInfo2.NativeDisplayChromaticityWhiteX}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display NativeDisplayChromaticityWhiteY = {displayDDCInfo2.NativeDisplayChromaticityWhiteY}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display PackedPixelSupported = {displayDDCInfo2.PackedPixelSupported}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display PanelPixelFormat = {displayDDCInfo2.PanelPixelFormat}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display ProductID = {displayDDCInfo2.ProductID}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display PTMCx = {displayDDCInfo2.PTMCx}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display PTMCy = {displayDDCInfo2.PTMCy}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display PTMRefreshRate = {displayDDCInfo2.PTMRefreshRate}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display SerialID = {displayDDCInfo2.SerialID}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display Size = {displayDDCInfo2.Size}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display SpecularScreenReflectance = {displayDDCInfo2.SpecularScreenReflectance}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display SupportedColorSpace = {displayDDCInfo2.SupportedColorSpace}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display SupportedHDR = {displayDDCInfo2.SupportedHDR}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display SupportedTransferFunction = {displayDDCInfo2.SupportedTransferFunction}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display SupportsDDC = {displayDDCInfo2.SupportsDDC}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display DDCInfoFlag Digital Device = {DDCInfoFlag.DIGITALDEVICE}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display DDCInfoFlag EDID Extension = {DDCInfoFlag.EDIDEXTENSION}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display DDCInfoFlag HDMI Audio Device = {DDCInfoFlag.HDMIAUDIODEVICE}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display DDCInfoFlag Projector Device = {DDCInfoFlag.PROJECTORDEVICE}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display DDCInfoFlag Supports AI = {DDCInfoFlag.SUPPORTS_AI}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display DDCInfoFlag Supports xvYCC601 = {DDCInfoFlag.SUPPORT_xvYCC601}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display DDCInfoFlag Supports xvYCC709 = {DDCInfoFlag.SUPPORT_xvYCC709}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display SupportedHDR Supports CEA861_3 = {supportedHDR.CEA861_3}");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display SupportedHDR Supports DOLBYVISION = {supportedHDR.DOLBYVISION}");
SharedLogger.logger.Trace($"AMDLibrary/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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn($"AMDLibrary/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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: ### Display HDR State for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Display HDR Supported = {HDRSupported}");
SharedLogger.logger.Trace($"AMDLibrary/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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn($"AMDLibrary/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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Exception getting AMD Vendor ID from video card. Substituting with a # instead");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Exception getting AMD Adapter Name from video card. Substituting with a # instead");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Exception getting AMD VendorID from video card. Substituting with a # instead");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Exception getting AMD AdapterID from video card. Substituting with a # instead");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
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)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Exception getting AMD Display Connector from video card to display. Substituting with a # instead");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
displayInfoIdentifierSection.Add("#");
}
try
{
displayInfoIdentifierSection.Add(oneDisplayInfo.DisplayName);
}
catch (Exception ex)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Exception getting Display Name from display connected to AMD video card. Substituting with a # instead");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
displayInfoIdentifierSection.Add("#");
}
try
{
displayInfoIdentifierSection.Add(displayDDCInfo2.ManufacturerID.ToString());
}
catch (Exception ex)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Exception getting Manufacturer ID from display connected to AMD video card. Substituting with a # instead");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
displayInfoIdentifierSection.Add("#");
}
try
{
displayInfoIdentifierSection.Add(displayDDCInfo2.ProductID.ToString());
}
catch (Exception ex)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Exception getting Product ID from display connected to AMD video card. Substituting with a # instead");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
displayInfoIdentifierSection.Add("#");
}
try
{
displayInfoIdentifierSection.Add(displayDDCInfo2.SerialID.ToString());
}
catch (Exception ex)
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn(ex, $"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Exception getting Serial ID from display connected to AMD video card. Substituting with a # instead");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
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))
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Your AMD driver reported the following Display Identifier multiple times, so ignoring it as we already have it: {displayIdentifier}");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Error running ADL2_Display_DisplayInfo_Get on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
}
// 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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn($"AMDLibrary/GenerateAllAvailableDisplayIdentifiers: Error running ADL2_Adapter_Active_Get on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
Correcting trace logging name
2021-06-19 07:42:54 +00:00
}
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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn($"AMDLibrary/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
{
Renamed ADLWrapper to AMDLibrary It better reflects the purpose of the class.
2021-06-19 22:45:45 +00:00
SharedLogger.logger.Warn($"AMDLibrary/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
}
}
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
[WIP] Initial ProfileItem split into libraries This is part of the new strategy to split the ProfileItems into different derived clases with one per Video card technology. The purpose is to allow each video card driver to produce a slightly different profiledata section which is customised to the needs of that video card. This will allieviate the need for us to extend the Path object to support AMD, as we'll be doing the differentiation at each ProfileItem. Time will tell if this is a better strategy or not. This is all to do with my even longer term strategy of devloping video card driver library files inhouse. This strategy was directly created just so that I can make changes in my own code if I need to support some additional features such as HDR support within the profiles. It is very difficult to do this if I'm using another video card library. Much more simple to update my own code!
2021-06-22 09:05:24 +00:00
public AMDProfile GetActiveProfile()
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
{
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Getting AMD active adapter count");
int ADLRet = ADL.ADL_ERR;
int NumberOfAdapters = 0;
List<string> displayIdentifiers = new List<string>();
AMDProfile profileToCreate = new AMDProfile();
[WIP] Part work on new Profile data structs Moving to a situation where each library has it's own ProfileData structure which will require me to break the existing Profile structure. This will be better once finished, but it could be a month before I get this rewrite finished :/
2021-06-20 05:13:21 +00:00
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
if (null != ADL.ADL2_Adapter_NumberOfAdapters_Get)
{
ADL.ADL2_Adapter_NumberOfAdapters_Get(_adlContextHandle, ref NumberOfAdapters);
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Number Of Adapters: {NumberOfAdapters.ToString()} ");
}
if (NumberOfAdapters > 0)
{
[WIP] Part work on new Profile data structs Moving to a situation where each library has it's own ProfileData structure which will require me to break the existing Profile structure. This will be better once finished, but it could be a month before I get this rewrite finished :/
2021-06-20 05:13:21 +00:00
profileToCreate.Adapters = new List<AMDAdapter>();
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
IntPtr AdapterBuffer = IntPtr.Zero;
if (ADL.ADL2_Adapter_AdapterInfoX4_Get != null)
{
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: ADL2_Adapter_AdapterInfoX4_Get DLL function exists.");
// Get the Adapter info and put it in the AdapterBuffer
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: 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)
{
int IsActive = ADL.ADL_TRUE; // We only want to search for active adapters
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Successfully run ADL2_Adapter_AdapterInfoX4_Get to find information about all known AMD adapters.");
ADLAdapterInfoX2 oneAdapter = new ADLAdapterInfoX2();
// Go through each adapter
for (int adapterLoop = 0; adapterLoop < numAdapters; adapterLoop++)
{
oneAdapter = (ADLAdapterInfoX2)Marshal.PtrToStructure(new IntPtr(AdapterBuffer.ToInt64() + (adapterLoop * Marshal.SizeOf(oneAdapter))), oneAdapter.GetType());
if (oneAdapter.Exist != 1)
{
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} doesn't exist at present so skipping detection for this adapter.");
continue;
}
if (oneAdapter.Present != 1)
{
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} isn't enabled at present so skipping detection for this adapter.");
continue;
}
// 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)
{
// Only continue if the adapter is enabled
if (IsActive != ADL.ADL_TRUE)
{
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: 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($"AMDLibrary/GenerateAllAGetActiveProfilevailableDisplayIdentifiers: AMD Adapter has an adapter index of {oneAdapter.AdapterIndex.ToString()} which indicates it is not a real adapter.");
continue;
}
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} is active! ({oneAdapter.AdapterName}).");
[WIP] Part work on new Profile data structs Moving to a situation where each library has it's own ProfileData structure which will require me to break the existing Profile structure. This will be better once finished, but it could be a month before I get this rewrite finished :/
2021-06-20 05:13:21 +00:00
// Store the Adapter information for later
AMDAdapter adapterToCreate = new AMDAdapter();
adapterToCreate.AdapterInfoX2 = oneAdapter;
adapterToCreate.Displays = new List<AMDDisplay>();
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: ### Adapter Info for Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter AdapterIndex = {oneAdapter.AdapterIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter AdapterName = {oneAdapter.AdapterName}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter BusNumber = {oneAdapter.BusNumber}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter DeviceNumber = {oneAdapter.DeviceNumber}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter DisplayName = {oneAdapter.DisplayName}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter DriverPath = {oneAdapter.DriverPath}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter DriverPathExt = {oneAdapter.DriverPathExt}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter Exist = {oneAdapter.Exist}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter FunctionNumber = {oneAdapter.FunctionNumber}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter InfoMask = {oneAdapter.InfoMask}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter InfoValue = {oneAdapter.InfoValue}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter OSDisplayIndex = {oneAdapter.OSDisplayIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter PNPString = {oneAdapter.PNPString}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter Present = {oneAdapter.Present}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter Size = {oneAdapter.Size}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter UDID = {oneAdapter.UDID}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter VendorID = {oneAdapter.VendorID}");
// Get the Adapter Capabilities
ADLAdapterCapsX2 AdapterCapabilities = new ADLAdapterCapsX2();
if (ADL.ADL2_AdapterX2_Caps != null)
{
ADLRet = ADL.ADL2_AdapterX2_Caps(_adlContextHandle, oneAdapter.AdapterIndex, out AdapterCapabilities);
}
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: ### Adapter Capabilities for Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter ID = {AdapterCapabilities.AdapterID}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter Capabilities Mask = {AdapterCapabilities.CapsMask}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter Capabilities Value = {AdapterCapabilities.CapsValue}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter Num of Connectors = {AdapterCapabilities.NumConnectors}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter Num of Controllers = {AdapterCapabilities.NumControllers}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter Num of Displays = {AdapterCapabilities.NumDisplays}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter Num of GL Sync Connectors = {AdapterCapabilities.NumOfGLSyncConnectors}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: Adapter Num of Overlays = {AdapterCapabilities.NumOverlays}");
[WIP] Part work on new Profile data structs Moving to a situation where each library has it's own ProfileData structure which will require me to break the existing Profile structure. This will be better once finished, but it could be a month before I get this rewrite finished :/
2021-06-20 05:13:21 +00:00
// Store the Adapters Info for later
profileToCreate.Adapters.Add(adapterToCreate);
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
if (ADL.ADL2_Display_DisplayInfo_Get != null)
{
IntPtr DisplayBuffer = IntPtr.Zero;
int numDisplays = 0;
// Force the display detection and get the Display Info. Use 0 as last parameter to NOT force detection
ADLRet = ADL.ADL2_Display_DisplayInfo_Get(_adlContextHandle, oneAdapter.AdapterIndex, ref numDisplays, out DisplayBuffer, 1);
if (ADLRet == ADL.ADL_OK)
{
try
[WIP] Part work on new Profile data structs Moving to a situation where each library has it's own ProfileData structure which will require me to break the existing Profile structure. This will be better once finished, but it could be a month before I get this rewrite finished :/
2021-06-20 05:13:21 +00:00
{
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
for (int displayLoop = 0; displayLoop < numDisplays; displayLoop++)
{
[WIP] Part work on new Profile data structs Moving to a situation where each library has it's own ProfileData structure which will require me to break the existing Profile structure. This will be better once finished, but it could be a month before I get this rewrite finished :/
2021-06-20 05:13:21 +00:00
ADLDisplayInfo oneDisplayInfo = new ADLDisplayInfo();
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
oneDisplayInfo = (ADLDisplayInfo)Marshal.PtrToStructure(new IntPtr(DisplayBuffer.ToInt64() + (displayLoop * Marshal.SizeOf(oneDisplayInfo))), oneDisplayInfo.GetType());
// Is the display mapped to this adapter? If not we skip it!
if (oneDisplayInfo.DisplayID.DisplayLogicalAdapterIndex != oneAdapter.AdapterIndex)
{
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: 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;
}
// Convert the displayInfoValue to something usable using a library function I made
ConvertedDisplayInfoValue displayInfoValue = ADL.ConvertDisplayInfoValue(oneDisplayInfo.DisplayInfoValue);
if (!displayInfoValue.DISPLAYCONNECTED)
{
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} ({oneAdapter.AdapterName}) AdapterID display ID#{oneDisplayInfo.DisplayID.DisplayLogicalIndex} is not connected");
continue;
}
// Skip connected but non-mapped displays (not mapped in windows) - we only want displays currently visible in the OS because they're in use
if (!displayInfoValue.DISPLAYMAPPED)
{
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} ({oneAdapter.AdapterName}) AdapterID display ID#{oneDisplayInfo.DisplayID.DisplayLogicalIndex} is not mapped in Windows OS");
continue;
}
SharedLogger.logger.Trace($"AMDLibrary/GetActiveProfile: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} ({oneAdapter.AdapterName}) AdapterID display ID#{oneDisplayInfo.DisplayID.DisplayLogicalIndex} is connected and mapped in Windows OS");
[WIP] Initial working AMD displayview Have managed to get a working displayview for AMD (not working in spanned mode) and currently playing with the colours and layout. Once I have something locked in, I'll troubleshoot the ProfileDisplay file writing.
2021-06-26 09:54:11 +00:00
ADL.ADLDisplayConnectionType displayConnector = (ADL.ADLDisplayConnectionType)oneDisplayInfo.DisplayConnector;
// Store the Display information for later
[WIP] Part work on new Profile data structs Moving to a situation where each library has it's own ProfileData structure which will require me to break the existing Profile structure. This will be better once finished, but it could be a month before I get this rewrite finished :/
2021-06-20 05:13:21 +00:00
AMDDisplay displayToCreate = new AMDDisplay();
displayToCreate.DisplayModes = new List<ADLMode>();
[WIP] Initial working AMD displayview Have managed to get a working displayview for AMD (not working in spanned mode) and currently playing with the colours and layout. Once I have something locked in, I'll troubleshoot the ProfileDisplay file writing.
2021-06-26 09:54:11 +00:00
displayToCreate.DisplayName = oneDisplayInfo.DisplayName;
displayToCreate.DisplayConnector = displayConnector.ToString("G");
[WIP] Basic working DisplayProfile writing and reading Now have the DisplayProfile storing the minimal set of data that it needs. It also recreates the Screens list (used for creating profile bitmaps and icons) and recreates the DisplayProfileBitmaps each time at present. I will add some logic to deerialise the bitmaps again at a later date once I've compeleted actually applying the AMD display confs.
2021-06-27 01:53:00 +00:00
displayToCreate.IsEyefinity = false;
displayToCreate.HDRSupported = false;
displayToCreate.HDREnabled = false;
[WIP] Part work on new Profile data structs Moving to a situation where each library has it's own ProfileData structure which will require me to break the existing Profile structure. This will be better once finished, but it could be a month before I get this rewrite finished :/
2021-06-20 05:13:21 +00:00
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: ### Display Info for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Connector = {displayConnector.ToString("G")}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Controller Index = {oneDisplayInfo.DisplayControllerIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Logical Adapter Index = {oneDisplayInfo.DisplayID.DisplayLogicalAdapterIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Logical Index = {oneDisplayInfo.DisplayID.DisplayLogicalIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Physical Adapter Index = {oneDisplayInfo.DisplayID.DisplayPhysicalAdapterIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Physical Index = {oneDisplayInfo.DisplayID.DisplayPhysicalIndex}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Mask = {oneDisplayInfo.DisplayInfoMask}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value = {oneDisplayInfo.DisplayInfoValue}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Manufacturer Name = {oneDisplayInfo.DisplayManufacturerName}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Name = {oneDisplayInfo.DisplayName}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Output Type = {oneDisplayInfo.DisplayOutputType}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Type = {oneDisplayInfo.DisplayType}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value DISPLAYCONNECTED = {displayInfoValue.DISPLAYCONNECTED}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value DISPLAYMAPPED = {displayInfoValue.DISPLAYMAPPED}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value FORCIBLESUPPORTED = {displayInfoValue.FORCIBLESUPPORTED}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value GENLOCKSUPPORTED = {displayInfoValue.GENLOCKSUPPORTED}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value LDA_DISPLAY = {displayInfoValue.LDA_DISPLAY}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value MANNER_SUPPORTED_2HSTRETCH = {displayInfoValue.MANNER_SUPPORTED_2HSTRETCH}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value MANNER_SUPPORTED_2VSTRETCH = {displayInfoValue.MANNER_SUPPORTED_2VSTRETCH}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value MANNER_SUPPORTED_CLONE = {displayInfoValue.MANNER_SUPPORTED_CLONE}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value MANNER_SUPPORTED_EXTENDED = {displayInfoValue.MANNER_SUPPORTED_EXTENDED}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value MANNER_SUPPORTED_NSTRETCH1GPU = {displayInfoValue.MANNER_SUPPORTED_NSTRETCH1GPU}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value MANNER_SUPPORTED_NSTRETCHNGPU = {displayInfoValue.MANNER_SUPPORTED_NSTRETCHNGPU}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value MANNER_SUPPORTED_SINGLE = {displayInfoValue.MANNER_SUPPORTED_SINGLE}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value MODETIMING_OVERRIDESSUPPORTED = {displayInfoValue.MODETIMING_OVERRIDESSUPPORTED}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value MULTIVPU_SUPPORTED = {displayInfoValue.MULTIVPU_SUPPORTED}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value NONLOCAL = {displayInfoValue.NONLOCAL}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Info Value SHOWTYPE_PROJECTOR = {displayInfoValue.SHOWTYPE_PROJECTOR}");
[WIP] Part work on new Profile data structs Moving to a situation where each library has it's own ProfileData structure which will require me to break the existing Profile structure. This will be better once finished, but it could be a month before I get this rewrite finished :/
2021-06-20 05:13:21 +00:00
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
IntPtr displayModeBuffer = IntPtr.Zero;
int numModes = 0;
if (ADL.ADL2_Display_Modes_Get != null)
{
// Get the ADLModes from the Display
ADLRet = ADL.ADL2_Display_Modes_Get(_adlContextHandle, oneAdapter.AdapterIndex, oneDisplayInfo.DisplayID.DisplayPhysicalIndex, out numModes, out displayModeBuffer);
if (ADLRet == ADL.ADL_OK)
{
[WIP] Part work on new Profile data structs Moving to a situation where each library has it's own ProfileData structure which will require me to break the existing Profile structure. This will be better once finished, but it could be a month before I get this rewrite finished :/
2021-06-20 05:13:21 +00:00
for (int displayModeLoop = 0; displayModeLoop < numModes; displayModeLoop++)
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
{
[WIP] Part work on new Profile data structs Moving to a situation where each library has it's own ProfileData structure which will require me to break the existing Profile structure. This will be better once finished, but it could be a month before I get this rewrite finished :/
2021-06-20 05:13:21 +00:00
ADLMode oneDisplayMode = new ADLMode();
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
oneDisplayMode = (ADLMode)Marshal.PtrToStructure(new IntPtr(displayModeBuffer.ToInt64() + (displayModeLoop * Marshal.SizeOf(oneDisplayMode))), oneDisplayMode.GetType());
[WIP] Part work on new Profile data structs Moving to a situation where each library has it's own ProfileData structure which will require me to break the existing Profile structure. This will be better once finished, but it could be a month before I get this rewrite finished :/
2021-06-20 05:13:21 +00:00
displayToCreate.DisplayModes.Add(oneDisplayMode);
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
//displayConnectionType = (ADL.ADLDisplayConnectionType)displayConfig.ConnectorType;
Update to v2.0.0 and added functions Decided that the DisplayProfile changes would have to be breaking changes if I was going to add HDR support, and be able to handle adding future video cards from different manufacturers. This all requires a change to the DisplayProfile format. So now this is going to use a file called DisplayProfiles_2.0.json rather than a file called DisplayProfiles_1.0.json. This is because the profiles will need to be generated again from scratch, as they will all be completely different to the format in DisplayProfiles_1.0.json.
2021-06-20 04:37:00 +00:00
ConvertedDisplayModeFlags displayModeFlag = ADL.ConvertDisplayModeFlags(oneDisplayMode.ModeFlag);
ConvertedDisplayModeFlags displayModeMask = ADL.ConvertDisplayModeFlags(oneDisplayMode.ModeMask);
ConvertedDisplayModeFlags displayModeValue = ADL.ConvertDisplayModeFlags(oneDisplayMode.ModeValue);
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: ### Display Modes for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode Colour Depth = {oneDisplayMode.ColourDepth}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode Mode Flag = {oneDisplayMode.ModeFlag}");
Update to v2.0.0 and added functions Decided that the DisplayProfile changes would have to be breaking changes if I was going to add HDR support, and be able to handle adding future video cards from different manufacturers. This all requires a change to the DisplayProfile format. So now this is going to use a file called DisplayProfiles_2.0.json rather than a file called DisplayProfiles_1.0.json. This is because the profiles will need to be generated again from scratch, as they will all be completely different to the format in DisplayProfiles_1.0.json.
2021-06-20 04:37:00 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode Mode Flag ColourFormat 565 = {displayModeFlag.COLOURFORMAT_565}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode Mode Flag ColourFormat 8888 = {displayModeFlag.COLOURFORMAT_8888}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode Mode Flag ORIENTATION_SUPPORTED_000 = {displayModeFlag.ORIENTATION_SUPPORTED_000}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode Mode Flag ORIENTATION_SUPPORTED_090 = {displayModeFlag.ORIENTATION_SUPPORTED_090}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode Mode Flag ORIENTATION_SUPPORTED_180 = {displayModeFlag.ORIENTATION_SUPPORTED_180}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode Mode Flag ORIENTATION_SUPPORTED_270 = {displayModeFlag.ORIENTATION_SUPPORTED_270}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode Mode Flag REFRESHRATE_ROUNDED = {displayModeFlag.REFRESHRATE_ROUNDED}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode Mode Flag REFRESHRATE_ONLY = {displayModeFlag.REFRESHRATE_ONLY}");
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode Mode Mask = {oneDisplayMode.ModeMask}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode Mode Value = {oneDisplayMode.ModeValue}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode Orientation = {oneDisplayMode.Orientation}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode Refresh Rate = {oneDisplayMode.RefreshRate}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode X Position = {oneDisplayMode.XPos}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode X Resolution = {oneDisplayMode.XRes}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode Y Position = {oneDisplayMode.YPos}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: DisplayMode Y Resolution = {oneDisplayMode.YRes}");
}
}
else
{
SharedLogger.logger.Warn($"AMDLibrary/GetActiveprofile: Error running ADL2_Display_DeviceConfig_Get on Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
}
}
ADLDDCInfo2 displayDDCInfo2 = new ADLDDCInfo2();
displayDDCInfo2.Size = Marshal.SizeOf(displayDDCInfo2);
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)
{
// 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
ConvertedSupportedHDR supportedHDR = ADL.ConvertSupportedHDR(displayDDCInfo2.SupportedHDR);
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: ### Display DDCInfo2 for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display AvgLuminanceData = {displayDDCInfo2.AvgLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DDCInfoFlag = {displayDDCInfo2.DDCInfoFlag}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DiffuseScreenReflectance = {displayDDCInfo2.DiffuseScreenReflectance}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DisplayName = {displayDDCInfo2.DisplayName}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display FreesyncFlags = {displayDDCInfo2.FreesyncFlags}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display ManufacturerID = {displayDDCInfo2.ManufacturerID}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MaxBacklightMaxLuminanceData = {displayDDCInfo2.MaxBacklightMaxLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MaxBacklightMinLuminanceData = {displayDDCInfo2.MaxBacklightMinLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MaxHResolution = {displayDDCInfo2.MaxHResolution}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MaxLuminanceData = {displayDDCInfo2.MaxLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MaxRefresh = {displayDDCInfo2.MaxRefresh}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MaxVResolution = {displayDDCInfo2.MaxVResolution}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MinBacklightMaxLuminanceData = {displayDDCInfo2.MinBacklightMaxLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MinBacklightMinLuminanceData = {displayDDCInfo2.MinBacklightMinLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MinLuminanceData = {displayDDCInfo2.MinLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MinLuminanceNoDimmingData = {displayDDCInfo2.MinLuminanceNoDimmingData}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display NativeDisplayChromaticityBlueX = {displayDDCInfo2.NativeDisplayChromaticityBlueX}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display NativeDisplayChromaticityBlueY = {displayDDCInfo2.NativeDisplayChromaticityBlueY}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display NativeDisplayChromaticityGreenX = {displayDDCInfo2.NativeDisplayChromaticityGreenX}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display NativeDisplayChromaticityGreenY = {displayDDCInfo2.NativeDisplayChromaticityGreenY}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display NativeDisplayChromaticityRedX = {displayDDCInfo2.NativeDisplayChromaticityRedX}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display NativeDisplayChromaticityRedY = {displayDDCInfo2.NativeDisplayChromaticityRedY}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display NativeDisplayChromaticityWhiteX = {displayDDCInfo2.NativeDisplayChromaticityWhiteX}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display NativeDisplayChromaticityWhiteY = {displayDDCInfo2.NativeDisplayChromaticityWhiteY}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display PackedPixelSupported = {displayDDCInfo2.PackedPixelSupported}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display PanelPixelFormat = {displayDDCInfo2.PanelPixelFormat}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display ProductID = {displayDDCInfo2.ProductID}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display PTMCx = {displayDDCInfo2.PTMCx}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display PTMCy = {displayDDCInfo2.PTMCy}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display PTMRefreshRate = {displayDDCInfo2.PTMRefreshRate}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SerialID = {displayDDCInfo2.SerialID}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Size = {displayDDCInfo2.Size}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SpecularScreenReflectance = {displayDDCInfo2.SpecularScreenReflectance}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SupportedColorSpace = {displayDDCInfo2.SupportedColorSpace}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SupportedHDR = {displayDDCInfo2.SupportedHDR}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SupportedTransferFunction = {displayDDCInfo2.SupportedTransferFunction}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SupportsDDC = {displayDDCInfo2.SupportsDDC}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DDCInfoFlag Digital Device = {DDCInfoFlag.DIGITALDEVICE}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DDCInfoFlag EDID Extension = {DDCInfoFlag.EDIDEXTENSION}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DDCInfoFlag HDMI Audio Device = {DDCInfoFlag.HDMIAUDIODEVICE}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DDCInfoFlag Projector Device = {DDCInfoFlag.PROJECTORDEVICE}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DDCInfoFlag Supports AI = {DDCInfoFlag.SUPPORTS_AI}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DDCInfoFlag Supports xvYCC601 = {DDCInfoFlag.SUPPORT_xvYCC601}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DDCInfoFlag Supports xvYCC709 = {DDCInfoFlag.SUPPORT_xvYCC709}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SupportedHDR Supports CEA861_3 = {supportedHDR.CEA861_3}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SupportedHDR Supports DOLBYVISION = {supportedHDR.DOLBYVISION}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SupportedHDR Supports FREESYNC_HDR = {supportedHDR.FREESYNC_HDR}");
}
else
{
SharedLogger.logger.Warn($"AMDLibrary/GetActiveprofile: Error running ADL2_Display_DDCInfo2_Get on Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
}
[WIP] Part work on new Profile data structs Moving to a situation where each library has it's own ProfileData structure which will require me to break the existing Profile structure. This will be better once finished, but it could be a month before I get this rewrite finished :/
2021-06-20 05:13:21 +00:00
// Add the things we learnt about the Display to the AMDProfile.
adapterToCreate.Displays.Add(displayToCreate);
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
}
[WIP] Basic working DisplayProfile writing and reading Now have the DisplayProfile storing the minimal set of data that it needs. It also recreates the Screens list (used for creating profile bitmaps and icons) and recreates the DisplayProfileBitmaps each time at present. I will add some logic to deerialise the bitmaps again at a later date once I've compeleted actually applying the AMD display confs.
2021-06-27 01:53:00 +00:00
// Add the HDR information to the profile display storage
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +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)
{
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: ### Display HDR State for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display HDR Supported = {HDRSupported}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display HDR Enabled = {HDREnabled}");
}
else
{
SharedLogger.logger.Warn($"AMDLibrary/GetActiveprofile: Error running ADL2_Display_HDRState_Get on Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
}
}
[WIP] Basic working DisplayProfile writing and reading Now have the DisplayProfile storing the minimal set of data that it needs. It also recreates the Screens list (used for creating profile bitmaps and icons) and recreates the DisplayProfileBitmaps each time at present. I will add some logic to deerialise the bitmaps again at a later date once I've compeleted actually applying the AMD display confs.
2021-06-27 01:53:00 +00:00
displayToCreate.HDREnabled = HDREnabled == 0 ? false : true;
displayToCreate.HDRSupported = HDRSupported == 0 ? false : true;
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
}
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ProfileRepository/GetActiveprofile: Exception caused trying to access attached displays");
continue;
}
}
else
{
SharedLogger.logger.Warn($"AMDLibrary/GetActiveprofile: 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);
}
}
else
{
SharedLogger.logger.Warn($"AMDLibrary/GetActiveprofile: Error running ADL2_Adapter_Active_Get on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
}
}
}
else
{
SharedLogger.logger.Warn($"AMDLibrary/GetActiveprofile: Error running ADL2_Adapter_AdapterInfoX4_Get on AMD Video card: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
}
}
// Release the memory for the AdapterInfo structure
if (IntPtr.Zero != AdapterBuffer)
{
Marshal.FreeCoTaskMem(AdapterBuffer);
}
}
else
{
SharedLogger.logger.Warn($"AMDLibrary/GetActiveprofile: There were no AMD adapters found by AMD ADL.");
[WIP] Initial working AMD displayview Have managed to get a working displayview for AMD (not working in spanned mode) and currently playing with the colours and layout. Once I have something locked in, I'll troubleshoot the ProfileDisplay file writing.
2021-06-26 09:54:11 +00:00
}
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
// Return the profile
return profileToCreate;
}
Added many DisplayConfigMap functions Added most of the ADL2 DisplayConfigMap functions to the ADL library in order to test them out ans see which ones make sense to use.
2021-06-27 08:46:32 +00:00
public bool SetActiveProfile(AMDProfile profileDataToUse)
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
{
Added many DisplayConfigMap functions Added most of the ADL2 DisplayConfigMap functions to the ADL library in order to test them out ans see which ones make sense to use.
2021-06-27 08:46:32 +00:00
// Get the list of adapters
// Get the list of displays
// Look for the display and see if it is used in the profile
// If it is then set the display up
// if it is not, then disable the display
// Make the driver settign permanent
SharedLogger.logger.Trace($"AMDLibrary/SetActiveProfile: Getting AMD active adapter count");
int ADLRet = ADL.ADL_ERR;
int NumberOfAdapters = 0;
List<AMDDisplay> UsedDisplays = new List<AMDDisplay>();
if (null != ADL.ADL2_Adapter_NumberOfAdapters_Get)
{
ADL.ADL2_Adapter_NumberOfAdapters_Get(_adlContextHandle, ref NumberOfAdapters);
SharedLogger.logger.Trace($"AMDLibrary/SetActiveProfile: Number Of Adapters: {NumberOfAdapters.ToString()} ");
}
if (NumberOfAdapters > 0)
{
IntPtr AdapterBuffer = IntPtr.Zero;
if (ADL.ADL2_Adapter_AdapterInfoX4_Get != null)
{
SharedLogger.logger.Trace($"AMDLibrary/SetActiveProfile: ADL2_Adapter_AdapterInfoX4_Get DLL function exists.");
// Get the Adapter info and put it in the AdapterBuffer
SharedLogger.logger.Trace($"AMDLibrary/SetActiveProfile: 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)
{
int IsActive = ADL.ADL_TRUE; // We only want to search for active adapters
SharedLogger.logger.Trace($"AMDLibrary/SetActiveProfile: Successfully run ADL2_Adapter_AdapterInfoX4_Get to find information about all known AMD adapters.");
ADLAdapterInfoX2 oneAdapter = new ADLAdapterInfoX2();
// Go through each adapter
for (int adapterLoop = 0; adapterLoop < numAdapters; adapterLoop++)
{
oneAdapter = (ADLAdapterInfoX2)Marshal.PtrToStructure(new IntPtr(AdapterBuffer.ToInt64() + (adapterLoop * Marshal.SizeOf(oneAdapter))), oneAdapter.GetType());
if (oneAdapter.Exist != 1)
{
SharedLogger.logger.Trace($"AMDLibrary/SetActiveProfile: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} doesn't exist at present so skipping detection for this adapter.");
continue;
}
if (oneAdapter.Present != 1)
{
SharedLogger.logger.Trace($"AMDLibrary/SetActiveProfile: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} isn't enabled at present so skipping detection for this adapter.");
continue;
}
// 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)
{
// Only continue if the adapter is enabled
if (IsActive != ADL.ADL_TRUE)
{
SharedLogger.logger.Trace($"AMDLibrary/SetActiveProfile: 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($"AMDLibrary/GenerateAllASetActiveProfilevailableDisplayIdentifiers: AMD Adapter has an adapter index of {oneAdapter.AdapterIndex.ToString()} which indicates it is not a real adapter.");
continue;
}
SharedLogger.logger.Trace($"AMDLibrary/SetActiveProfile: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} is active! ({oneAdapter.AdapterName}).");
/*// Get the Adapter Capabilities
ADLAdapterCapsX2 AdapterCapabilities = new ADLAdapterCapsX2();
if (ADL.ADL2_AdapterX2_Caps != null)
{
ADLRet = ADL.ADL2_AdapterX2_Caps(_adlContextHandle, oneAdapter.AdapterIndex, out AdapterCapabilities);
}*/
if (ADL.ADL2_Display_DisplayInfo_Get != null)
{
IntPtr DisplayBuffer = IntPtr.Zero;
int numDisplays = 0;
// Force the display detection and get the Display Info. Use 0 as last parameter to NOT force detection
ADLRet = ADL.ADL2_Display_DisplayInfo_Get(_adlContextHandle, oneAdapter.AdapterIndex, ref numDisplays, out DisplayBuffer, 1);
if (ADLRet == ADL.ADL_OK)
{
try
{
for (int displayLoop = 0; displayLoop < numDisplays; displayLoop++)
{
ADLDisplayInfo oneDisplayInfo = new ADLDisplayInfo();
oneDisplayInfo = (ADLDisplayInfo)Marshal.PtrToStructure(new IntPtr(DisplayBuffer.ToInt64() + (displayLoop * Marshal.SizeOf(oneDisplayInfo))), oneDisplayInfo.GetType());
// Is the display mapped to this adapter? If not we skip it!
if (oneDisplayInfo.DisplayID.DisplayLogicalAdapterIndex != oneAdapter.AdapterIndex)
{
SharedLogger.logger.Trace($"AMDLibrary/SetActiveProfile: 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;
}
// Convert the displayInfoValue to something usable using a library function I made
ConvertedDisplayInfoValue displayInfoValue = ADL.ConvertDisplayInfoValue(oneDisplayInfo.DisplayInfoValue);
if (!displayInfoValue.DISPLAYCONNECTED)
{
SharedLogger.logger.Trace($"AMDLibrary/SetActiveProfile: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} ({oneAdapter.AdapterName}) AdapterID display ID#{oneDisplayInfo.DisplayID.DisplayLogicalIndex} is not connected");
continue;
}
SharedLogger.logger.Trace($"AMDLibrary/SetActiveProfile: AMD Adapter #{oneAdapter.AdapterIndex.ToString()} ({oneAdapter.AdapterName}) AdapterID display ID#{oneDisplayInfo.DisplayID.DisplayLogicalIndex} is connected and mapped in Windows OS");
// At this point we have the basic information about the displays currently connected
// We need to check to see what we do in order to implement this profile
// We may need to disable profiles
// We may need to move windows
foreach (AMDAdapter storedAMDAdapter in profileDataToUse.Adapters)
{
if (oneAdapter.AdapterIndex == storedAMDAdapter.AdapterIndex)
{
foreach (AMDDisplay storedAMDDisplay in storedAMDAdapter.Displays)
{
if (oneAdapter.UDID == storedAMDDisplay.UDID)
{
// Then this is one that we want to change and use
// First step is to record the fact we used this one
// This is used to figre out the displays we need to turn off later
UsedDisplays.Add(storedAMDDisplay);
// Set the basic display configuration
//ADL.ADL2_Display_Modes_Set
IntPtr displayModeBuffer = IntPtr.Zero;
int numModes = 0;
if (ADL.ADL2_Display_Modes_Get != null)
{
// Get the ADLModes from the Display
ADLRet = ADL.ADL2_Display_Modes_Get(_adlContextHandle, oneAdapter.AdapterIndex, oneDisplayInfo.DisplayID.DisplayPhysicalIndex, out numModes, out displayModeBuffer);
if (ADLRet == ADL.ADL_OK)
{
for (int displayModeLoop = 0; displayModeLoop < numModes; displayModeLoop++)
{
ADLMode oneDisplayMode = new ADLMode();
oneDisplayMode = (ADLMode)Marshal.PtrToStructure(new IntPtr(displayModeBuffer.ToInt64() + (displayModeLoop * Marshal.SizeOf(oneDisplayMode))), oneDisplayMode.GetType());
}
}
else
{
SharedLogger.logger.Warn($"AMDLibrary/GetActiveprofile: Error running ADL2_Display_DeviceConfig_Get on Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
}
}
// Set the display color configuration
//ADL.ADL2_Display_Color_Set
// Set the display mode timing override configuration
//ADL.ADL2_Display_ModeTimingOverride_Set
// Set the HDR function if needed
if (storedAMDDisplay.HDREnabled)
{
//ADL.ADL2_Display_HDRState_Set
}
}
}
}
}
ADLDDCInfo2 displayDDCInfo2 = new ADLDDCInfo2();
displayDDCInfo2.Size = Marshal.SizeOf(displayDDCInfo2);
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)
{
// 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
ConvertedSupportedHDR supportedHDR = ADL.ConvertSupportedHDR(displayDDCInfo2.SupportedHDR);
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: ### Display DDCInfo2 for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display AvgLuminanceData = {displayDDCInfo2.AvgLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DDCInfoFlag = {displayDDCInfo2.DDCInfoFlag}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DiffuseScreenReflectance = {displayDDCInfo2.DiffuseScreenReflectance}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DisplayName = {displayDDCInfo2.DisplayName}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display FreesyncFlags = {displayDDCInfo2.FreesyncFlags}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display ManufacturerID = {displayDDCInfo2.ManufacturerID}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MaxBacklightMaxLuminanceData = {displayDDCInfo2.MaxBacklightMaxLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MaxBacklightMinLuminanceData = {displayDDCInfo2.MaxBacklightMinLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MaxHResolution = {displayDDCInfo2.MaxHResolution}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MaxLuminanceData = {displayDDCInfo2.MaxLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MaxRefresh = {displayDDCInfo2.MaxRefresh}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MaxVResolution = {displayDDCInfo2.MaxVResolution}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MinBacklightMaxLuminanceData = {displayDDCInfo2.MinBacklightMaxLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MinBacklightMinLuminanceData = {displayDDCInfo2.MinBacklightMinLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MinLuminanceData = {displayDDCInfo2.MinLuminanceData}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display MinLuminanceNoDimmingData = {displayDDCInfo2.MinLuminanceNoDimmingData}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display NativeDisplayChromaticityBlueX = {displayDDCInfo2.NativeDisplayChromaticityBlueX}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display NativeDisplayChromaticityBlueY = {displayDDCInfo2.NativeDisplayChromaticityBlueY}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display NativeDisplayChromaticityGreenX = {displayDDCInfo2.NativeDisplayChromaticityGreenX}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display NativeDisplayChromaticityGreenY = {displayDDCInfo2.NativeDisplayChromaticityGreenY}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display NativeDisplayChromaticityRedX = {displayDDCInfo2.NativeDisplayChromaticityRedX}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display NativeDisplayChromaticityRedY = {displayDDCInfo2.NativeDisplayChromaticityRedY}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display NativeDisplayChromaticityWhiteX = {displayDDCInfo2.NativeDisplayChromaticityWhiteX}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display NativeDisplayChromaticityWhiteY = {displayDDCInfo2.NativeDisplayChromaticityWhiteY}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display PackedPixelSupported = {displayDDCInfo2.PackedPixelSupported}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display PanelPixelFormat = {displayDDCInfo2.PanelPixelFormat}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display ProductID = {displayDDCInfo2.ProductID}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display PTMCx = {displayDDCInfo2.PTMCx}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display PTMCy = {displayDDCInfo2.PTMCy}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display PTMRefreshRate = {displayDDCInfo2.PTMRefreshRate}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SerialID = {displayDDCInfo2.SerialID}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display Size = {displayDDCInfo2.Size}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SpecularScreenReflectance = {displayDDCInfo2.SpecularScreenReflectance}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SupportedColorSpace = {displayDDCInfo2.SupportedColorSpace}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SupportedHDR = {displayDDCInfo2.SupportedHDR}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SupportedTransferFunction = {displayDDCInfo2.SupportedTransferFunction}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SupportsDDC = {displayDDCInfo2.SupportsDDC}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DDCInfoFlag Digital Device = {DDCInfoFlag.DIGITALDEVICE}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DDCInfoFlag EDID Extension = {DDCInfoFlag.EDIDEXTENSION}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DDCInfoFlag HDMI Audio Device = {DDCInfoFlag.HDMIAUDIODEVICE}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DDCInfoFlag Projector Device = {DDCInfoFlag.PROJECTORDEVICE}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DDCInfoFlag Supports AI = {DDCInfoFlag.SUPPORTS_AI}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DDCInfoFlag Supports xvYCC601 = {DDCInfoFlag.SUPPORT_xvYCC601}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display DDCInfoFlag Supports xvYCC709 = {DDCInfoFlag.SUPPORT_xvYCC709}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SupportedHDR Supports CEA861_3 = {supportedHDR.CEA861_3}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SupportedHDR Supports DOLBYVISION = {supportedHDR.DOLBYVISION}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display SupportedHDR Supports FREESYNC_HDR = {supportedHDR.FREESYNC_HDR}");
}
else
{
SharedLogger.logger.Warn($"AMDLibrary/GetActiveprofile: Error running ADL2_Display_DDCInfo2_Get on Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
}
}
// Add the HDR information to the profile display storage
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)
{
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: ### Display HDR State for Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex} ###");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display HDR Supported = {HDRSupported}");
SharedLogger.logger.Trace($"AMDLibrary/GetActiveprofile: Display HDR Enabled = {HDREnabled}");
}
else
{
SharedLogger.logger.Warn($"AMDLibrary/GetActiveprofile: Error running ADL2_Display_HDRState_Get on Display #{oneDisplayInfo.DisplayID.DisplayLogicalIndex} on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
}
}
}
}
catch (Exception ex)
{
SharedLogger.logger.Warn(ex, $"ProfileRepository/GetActiveprofile: Exception caused trying to access attached displays");
continue;
}
}
else
{
SharedLogger.logger.Warn($"AMDLibrary/GetActiveprofile: 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);
}
}
else
{
SharedLogger.logger.Warn($"AMDLibrary/GetActiveprofile: Error running ADL2_Adapter_Active_Get on Adapter #{oneAdapter.AdapterIndex}: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
}
}
}
else
{
SharedLogger.logger.Warn($"AMDLibrary/GetActiveprofile: Error running ADL2_Adapter_AdapterInfoX4_Get on AMD Video card: {ADL.ConvertADLReturnValueIntoWords(ADLRet)}");
}
}
// Release the memory for the AdapterInfo structure
if (IntPtr.Zero != AdapterBuffer)
{
Marshal.FreeCoTaskMem(AdapterBuffer);
}
}
else
{
SharedLogger.logger.Warn($"AMDLibrary/GetActiveprofile: There were no AMD adapters found by AMD ADL.");
return false;
}
[WIP] Part work on new Profile data structs Moving to a situation where each library has it's own ProfileData structure which will require me to break the existing Profile structure. This will be better once finished, but it could be a month before I get this rewrite finished :/
2021-06-20 05:13:21 +00:00
return true;
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
}
[WIP] Initial apply AMD profile scaffolding Have now got it so that an AMD DisplayProfile now results in the profile attempting to be applied.
2021-06-27 03:10:59 +00:00
/*public bool IsActiveProfile(AMDProfile profileToTest)
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
{
[WIP] Part work on new Profile data structs Moving to a situation where each library has it's own ProfileData structure which will require me to break the existing Profile structure. This will be better once finished, but it could be a month before I get this rewrite finished :/
2021-06-20 05:13:21 +00:00
return true;
[WIP] Initial apply AMD profile scaffolding Have now got it so that an AMD DisplayProfile now results in the profile attempting to be applied.
2021-06-27 03:10:59 +00:00
}*/
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
[WIP] Initial ProfileItem split into libraries This is part of the new strategy to split the ProfileItems into different derived clases with one per Video card technology. The purpose is to allow each video card driver to produce a slightly different profiledata section which is customised to the needs of that video card. This will allieviate the need for us to extend the Path object to support AMD, as we'll be doing the differentiation at each ProfileItem. Time will tell if this is a better strategy or not. This is all to do with my even longer term strategy of devloping video card driver library files inhouse. This strategy was directly created just so that I can make changes in my own code if I need to support some additional features such as HDR support within the profiles. It is very difficult to do this if I'm using another video card library. Much more simple to update my own code!
2021-06-22 09:05:24 +00:00
public bool IsValidProfile(AMDProfile profileToTest)
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
{
[WIP] Part work on new Profile data structs Moving to a situation where each library has it's own ProfileData structure which will require me to break the existing Profile structure. This will be better once finished, but it could be a month before I get this rewrite finished :/
2021-06-20 05:13:21 +00:00
return true;
Change Display Profiles to v2.0 We have to do this as we will be moving to a new video card library-based way of getting the Display Profiles information. This is designed to enable me to add new video card drivers in the future, such as Intel, in order to support 'combined' video screens,
2021-06-20 03:20:43 +00:00
}
[WIP] Connecting AMDProfile to screens Trying to figure out a video card agnostic way of generating the display icons fo both standard and spanned displays. Still trying to figure out exactly which AMD ADL calls I need to make to get all the information I need. It is NOT very well documented. It's actually really annoying! AMD need to do better.
2021-06-25 09:52:02 +00:00
[WIP] Basic working DisplayProfile writing and reading Now have the DisplayProfile storing the minimal set of data that it needs. It also recreates the Screens list (used for creating profile bitmaps and icons) and recreates the DisplayProfileBitmaps each time at present. I will add some logic to deerialise the bitmaps again at a later date once I've compeleted actually applying the AMD display confs.
2021-06-27 01:53:00 +00:00
[WIP] Partially extended AMD ADL lib
2021-06-12 21:44:36 +00:00
}
}
Reference in New Issue Copy Permalink