Skip to content

Commit

Permalink
make IGCLBackend use delegates rather than DLLImport
Browse files Browse the repository at this point in the history 
Still unable to fix CTL_RESULT_ERROR_OS_CALL and fix intel/drivers.gpu.control-library#78
  • Loading branch information
@Valkirie @CasperH2O
Valkirie authored and CasperH2O committed Apr 8, 2024
1 parent 9f98f02 commit 3759e12
Show file tree
Hide file tree
Showing 3 changed files with 109 additions and 50 deletions.
2 changes: 1 addition & 1 deletion HandheldCompanion/GraphicsProcessingUnit/IntelGPU.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ private void TelemetryTimer_Elapsed(object? sender, ElapsedEventArgs e)
{
if (telemetryLock.TryEnter())
{
TelemetryData = GetTelemetryData(deviceIdx);
TelemetryData = GetTelemetry(deviceIdx);
telemetryLock.Exit();
}
}
Expand Down
157 changes: 108 additions & 49 deletions HandheldCompanion/IGCL/IGCLBackend.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,70 +384,124 @@ public struct ctl_telemetry_data
public double FanSpeedValue;
}

[DllImport("IGCL_Wrapper.dll")]
private static extern ctl_result_t IntializeIgcl();
[DllImport("kernel32")]
public static extern IntPtr LoadLibrary(string lpFileName);

[DllImport("IGCL_Wrapper.dll")]
private static extern void CloseIgcl();

[DllImport("IGCL_Wrapper.dll")]
public static extern uint GetAdapterCounts();

[DllImport("IGCL_Wrapper.dll", CallingConvention = CallingConvention.Cdecl)]
private static extern IntPtr EnumerateDevices(ref uint pAdapterCount);

[DllImport("IGCL_Wrapper.dll", CallingConvention = CallingConvention.Cdecl)]
private static extern ctl_result_t GetDeviceProperties(ctl_device_adapter_handle_t hDevice, ref ctl_device_adapter_properties_t StDeviceAdapterProperties);

// RetroScaling
[DllImport("IGCL_Wrapper.dll", CallingConvention = CallingConvention.Cdecl)]
static extern ctl_result_t GetRetroScalingCaps(ctl_device_adapter_handle_t hDevice, ref ctl_retro_scaling_caps_t RetroScalingCaps);

[DllImport("IGCL_Wrapper.dll", CallingConvention = CallingConvention.Cdecl)]
static extern ctl_result_t GetRetroScalingSettings(ctl_device_adapter_handle_t hDevice, ref ctl_retro_scaling_settings_t RetroScalingSettings);

[DllImport("IGCL_Wrapper.dll", CallingConvention = CallingConvention.Cdecl)]
static extern ctl_result_t SetRetroScalingSettings(ctl_device_adapter_handle_t hDevice, ctl_retro_scaling_settings_t retroScalingSettings);

// Scaling
[DllImport("IGCL_Wrapper.dll", CallingConvention = CallingConvention.Cdecl)]
static extern ctl_result_t GetScalingCaps(ctl_device_adapter_handle_t hDevice, uint idx, ref ctl_scaling_caps_t ScalingCaps);

[DllImport("IGCL_Wrapper.dll", CallingConvention = CallingConvention.Cdecl)]
static extern ctl_result_t GetScalingSettings(ctl_device_adapter_handle_t hDevice, uint idx, ref ctl_scaling_settings_t ScalingSetting);

[DllImport("IGCL_Wrapper.dll", CallingConvention = CallingConvention.Cdecl)]
static extern ctl_result_t SetScalingSettings(ctl_device_adapter_handle_t hDevice, uint idx, ctl_scaling_settings_t scalingSettings);

// Sharpness
[DllImport("IGCL_Wrapper.dll", CallingConvention = CallingConvention.Cdecl)]
static extern ctl_result_t GetSharpnessCaps(ctl_device_adapter_handle_t hDevice, uint idx, ref ctl_sharpness_caps_t SharpnessCaps);
[DllImport("kernel32", SetLastError = true)]
private static extern bool FreeLibrary(IntPtr hModule);

[DllImport("kernel32", CharSet = CharSet.Ansi, SetLastError = true, ExactSpelling = false)]
private static extern IntPtr GetProcAddress(IntPtr hModule, [MarshalAs(UnmanagedType.LPStr)] string lpProcName);

// Define the function delegates with the same signatures as the functions in the DLL
private delegate ctl_result_t InitializeIgclDelegate();
private delegate void CloseIgclDelegate();
private delegate IntPtr EnumerateDevicesDelegate(ref uint pAdapterCount);
private delegate ctl_result_t GetDevicePropertiesDelegate(ctl_device_adapter_handle_t hDevice, ref ctl_device_adapter_properties_t StDeviceAdapterProperties);
private delegate ctl_result_t GetRetroScalingCapsDelegate(ctl_device_adapter_handle_t hDevice, ref ctl_retro_scaling_caps_t RetroScalingCaps);
private delegate ctl_result_t GetRetroScalingSettingsDelegate(ctl_device_adapter_handle_t hDevice, ref ctl_retro_scaling_settings_t RetroScalingSettings);
private delegate ctl_result_t SetRetroScalingSettingsDelegate(ctl_device_adapter_handle_t hDevice, ctl_retro_scaling_settings_t retroScalingSettings);
private delegate ctl_result_t GetScalingCapsDelegate(ctl_device_adapter_handle_t hDevice, uint idx, ref ctl_scaling_caps_t ScalingCaps);
private delegate ctl_result_t GetScalingSettingsDelegate(ctl_device_adapter_handle_t hDevice, uint idx, ref ctl_scaling_settings_t ScalingSetting);
private delegate ctl_result_t SetScalingSettingsDelegate(ctl_device_adapter_handle_t hDevice, uint idx, ctl_scaling_settings_t scalingSettings);
private delegate ctl_result_t GetSharpnessCapsDelegate(ctl_device_adapter_handle_t hDevice, uint idx, ref ctl_sharpness_caps_t SharpnessCaps);
private delegate ctl_result_t GetSharpnessSettingsDelegate(ctl_device_adapter_handle_t hDevice, uint idx, ref ctl_sharpness_settings_t GetSharpness);
private delegate ctl_result_t SetSharpnessSettingsDelegate(ctl_device_adapter_handle_t hDevice, uint idx, ctl_sharpness_settings_t SetSharpness);
private delegate ctl_result_t GetTelemetryDataDelegate(ctl_device_adapter_handle_t hDevice, ref ctl_telemetry_data TelemetryData);

// Define the function pointers
private static InitializeIgclDelegate InitializeIgcl;
private static CloseIgclDelegate CloseIgcl;
private static EnumerateDevicesDelegate EnumerateDevices;
private static GetDevicePropertiesDelegate GetDeviceProperties;
private static GetRetroScalingCapsDelegate GetRetroScalingCaps;
private static GetRetroScalingSettingsDelegate GetRetroScalingSettings;
private static SetRetroScalingSettingsDelegate SetRetroScalingSettings;
private static GetScalingCapsDelegate GetScalingCaps;
private static GetScalingSettingsDelegate GetScalingSettings;
private static SetScalingSettingsDelegate SetScalingSettings;
private static GetSharpnessCapsDelegate GetSharpnessCaps;
private static GetSharpnessSettingsDelegate GetSharpnessSettings;
private static SetSharpnessSettingsDelegate SetSharpnessSettings;
private static GetTelemetryDataDelegate GetTelemetryData;

[DllImport("IGCL_Wrapper.dll", CallingConvention = CallingConvention.Cdecl)]
static extern ctl_result_t GetSharpnessSettings(ctl_device_adapter_handle_t hDevice, uint idx, ref ctl_sharpness_settings_t GetSharpness);
public static IntPtr[] devices = new IntPtr[1] { IntPtr.Zero };
private static IntPtr pDll = IntPtr.Zero;

[DllImport("IGCL_Wrapper.dll", CallingConvention = CallingConvention.Cdecl)]
static extern ctl_result_t SetSharpnessSettings(ctl_device_adapter_handle_t hDevice, uint idx, ctl_sharpness_settings_t SetSharpness);
// for this support library
public enum IGCLStatus
{
NO_ERROR = 0,
DLL_NOT_FOUND = 1,
DLL_INCORRECT_VERSION = 2,
DLL_INITIALIZE_ERROR = 3
}

[DllImport("IGCL_Wrapper.dll", CallingConvention = CallingConvention.Cdecl)]
static extern ctl_result_t GetTelemetryData(ctl_device_adapter_handle_t hDevice, ref ctl_telemetry_data TelemetryData);
private const string dllName = "IGCL_Wrapper.dll";
private static IGCLStatus status = IGCLStatus.NO_ERROR;

[DllImport("kernel32", SetLastError = true)]
static extern IntPtr LocalFree(IntPtr mem);
private static Delegate GetDelegate(string procName, Type delegateType)
{
IntPtr ptr = GetProcAddress(pDll, procName);
if (ptr != IntPtr.Zero)
{
var d = Marshal.GetDelegateForFunctionPointer(ptr, delegateType);
return d;
}

public static IntPtr[] devices = new IntPtr[1] { IntPtr.Zero };
var result = Marshal.GetHRForLastWin32Error();
throw Marshal.GetExceptionForHR(result);
}

public static bool Initialize()
{
pDll = LoadLibrary(dllName);
if (pDll == IntPtr.Zero)
{
status = IGCLStatus.DLL_NOT_FOUND;
}
else
{
try
{
// Get the function pointers
InitializeIgcl = (InitializeIgclDelegate)GetDelegate("IntializeIgcl", typeof(InitializeIgclDelegate));
CloseIgcl = (CloseIgclDelegate)GetDelegate("CloseIgcl", typeof(CloseIgclDelegate));
EnumerateDevices = (EnumerateDevicesDelegate)GetDelegate("EnumerateDevices", typeof(EnumerateDevicesDelegate));
GetDeviceProperties = (GetDevicePropertiesDelegate)GetDelegate("GetDeviceProperties", typeof(GetDevicePropertiesDelegate));
GetRetroScalingCaps = (GetRetroScalingCapsDelegate)GetDelegate("GetRetroScalingCaps", typeof(GetRetroScalingCapsDelegate));
GetRetroScalingSettings = (GetRetroScalingSettingsDelegate)GetDelegate("GetRetroScalingSettings", typeof(GetRetroScalingSettingsDelegate));
SetRetroScalingSettings = (SetRetroScalingSettingsDelegate)GetDelegate("SetRetroScalingSettings", typeof(SetRetroScalingSettingsDelegate));
GetScalingCaps = (GetScalingCapsDelegate)GetDelegate("GetScalingCaps", typeof(GetScalingCapsDelegate));
GetScalingSettings = (GetScalingSettingsDelegate)GetDelegate("GetScalingSettings", typeof(GetScalingSettingsDelegate));
SetScalingSettings = (SetScalingSettingsDelegate)GetDelegate("SetScalingSettings", typeof(SetScalingSettingsDelegate));
GetSharpnessCaps = (GetSharpnessCapsDelegate)GetDelegate("GetSharpnessCaps", typeof(GetSharpnessCapsDelegate));
GetSharpnessSettings = (GetSharpnessSettingsDelegate)GetDelegate("GetSharpnessSettings", typeof(GetSharpnessSettingsDelegate));
SetSharpnessSettings = (SetSharpnessSettingsDelegate)GetDelegate("SetSharpnessSettings", typeof(SetSharpnessSettingsDelegate));
GetTelemetryData = (GetTelemetryDataDelegate)GetDelegate("GetTelemetryData", typeof(GetTelemetryDataDelegate));
}
catch
{
status = IGCLStatus.DLL_INITIALIZE_ERROR;
}
}

if (status != IGCLStatus.NO_ERROR)
return false;

ctl_result_t Result = ctl_result_t.CTL_RESULT_SUCCESS;

// Call Init and check the result
Result = IntializeIgcl();
Result = InitializeIgcl();
return Result == ctl_result_t.CTL_RESULT_SUCCESS;
}

public static int GetDeviceIdx(string deviceName)
{
// test
Terminate();
Initialize();

ctl_result_t Result = ctl_result_t.CTL_RESULT_SUCCESS;
uint adapterCount = 0;

Expand Down Expand Up @@ -483,7 +537,12 @@ public static int GetDeviceIdx(string deviceName)

public static void Terminate()
{
CloseIgcl();
if (pDll != IntPtr.Zero)
{
CloseIgcl();
FreeLibrary(pDll);
pDll = IntPtr.Zero;
}
}

internal static bool HasGPUScalingSupport(nint deviceIdx, uint displayIdx)
Expand Down Expand Up @@ -829,7 +888,7 @@ internal static bool SetIntegerScaling(nint deviceIdx, bool enabled, byte type)
return RetroScalingSettings.Enable == enabled;
}

internal static ctl_telemetry_data GetTelemetryData(nint deviceIdx)
public static ctl_telemetry_data GetTelemetry(nint deviceIdx)
{
ctl_result_t Result = ctl_result_t.CTL_RESULT_SUCCESS;
ctl_telemetry_data TelemetryData = new();
Expand Down
Binary file modified HandheldCompanion/IGCL_Wrapper.dll
View file
Binary file not shown.

0 comments on commit 3759e12

Please sign in to comment.