diff --git a/nspector/Common/CustomSettings/CustomSetting.cs b/nspector/Common/CustomSettings/CustomSetting.cs index 8423b5e..62d2287 100644 --- a/nspector/Common/CustomSettings/CustomSetting.cs +++ b/nspector/Common/CustomSettings/CustomSetting.cs @@ -13,6 +13,7 @@ namespace nspector.Common.CustomSettings public string HexSettingId { get; set; } public string Description { get; set; } public string GroupName { get; set; } + public string AlternateNames { get; set; } public string OverrideDefault { get; set; } public float MinRequiredDriverVersion { get; set; } public float MaxRequiredDriverVersion { get; set; } diff --git a/nspector/Common/DrsSettingsMetaService.cs b/nspector/Common/DrsSettingsMetaService.cs index bd7648d..e2a22b7 100644 --- a/nspector/Common/DrsSettingsMetaService.cs +++ b/nspector/Common/DrsSettingsMetaService.cs @@ -106,6 +106,17 @@ namespace nspector.Common return null; } + private string GetAlternateNames(uint settingId) + { + foreach (var service in MetaServices.OrderBy(x => x.Service.Source)) + { + var altNames = service.Service.GetAlternateNames(settingId); + if (altNames != null) + return altNames; + } + return null; + } + private uint GetDwordDefaultValue(uint settingId) { foreach (var service in MetaServices.OrderBy(x => x.Service.Source)) @@ -301,13 +312,12 @@ namespace nspector.Common if (groupName == null) groupName = GetLegacyGroupName(settingId, settingName); - - var result = new SettingMeta() { SettingType = settingType, SettingName = settingName, GroupName = groupName, + AlternateNames = GetAlternateNames(settingId), IsApiExposed = GetIsApiExposed(settingId), IsSettingHidden = GetIsSettingHidden(settingId), @@ -351,6 +361,7 @@ namespace nspector.Common SettingName = settingMeta.SettingName, SettingType = settingMeta.SettingType, GroupName = settingMeta.GroupName, + AlternateNames = settingMeta.AlternateNames, IsApiExposed = settingMeta.IsApiExposed, IsSettingHidden = settingMeta.IsSettingHidden, Description = settingMeta.Description, diff --git a/nspector/Common/DrsSettingsService.cs b/nspector/Common/DrsSettingsService.cs index b2f4e61..0a0bc35 100644 --- a/nspector/Common/DrsSettingsService.cs +++ b/nspector/Common/DrsSettingsService.cs @@ -471,6 +471,7 @@ namespace nspector.Common SettingId = setting.settingId, SettingText = settingMeta.SettingName, GroupName = settingMeta.GroupName, + AlternateNames = settingMeta.AlternateNames, ValueRaw = valueRaw, ValueText = valueText, State = settingState, diff --git a/nspector/Common/Meta/ConstantSettingMetaService.cs b/nspector/Common/Meta/ConstantSettingMetaService.cs index 10ae2a1..4e2e545 100644 --- a/nspector/Common/Meta/ConstantSettingMetaService.cs +++ b/nspector/Common/Meta/ConstantSettingMetaService.cs @@ -157,6 +157,11 @@ namespace nspector.Common.Meta return null; } + public string GetAlternateNames(uint settingId) + { + return null; + } + public byte[] GetBinaryDefaultValue(uint settingId) { return null; diff --git a/nspector/Common/Meta/CustomSettingMetaService.cs b/nspector/Common/Meta/CustomSettingMetaService.cs index f2e1297..1524310 100644 --- a/nspector/Common/Meta/CustomSettingMetaService.cs +++ b/nspector/Common/Meta/CustomSettingMetaService.cs @@ -111,6 +111,14 @@ namespace nspector.Common.Meta return null; } + public string GetAlternateNames(uint settingId) + { + var setting = customSettings.Settings + .FirstOrDefault(x => x.SettingId.Equals(settingId)); + + return setting?.AlternateNames; + } + public byte[] GetBinaryDefaultValue(uint settingId) { return null; diff --git a/nspector/Common/Meta/DriverSettingMetaService.cs b/nspector/Common/Meta/DriverSettingMetaService.cs index 58b531f..6f75e92 100644 --- a/nspector/Common/Meta/DriverSettingMetaService.cs +++ b/nspector/Common/Meta/DriverSettingMetaService.cs @@ -201,6 +201,11 @@ namespace nspector.Common.Meta return null; } + public string GetAlternateNames(uint settingId) + { + return null; + } + public byte[] GetBinaryDefaultValue(uint settingId) { var settingMeta = GetSettingsMeta(settingId); diff --git a/nspector/Common/Meta/ISettingMetaService.cs b/nspector/Common/Meta/ISettingMetaService.cs index da7d06b..f368af6 100644 --- a/nspector/Common/Meta/ISettingMetaService.cs +++ b/nspector/Common/Meta/ISettingMetaService.cs @@ -16,6 +16,8 @@ namespace nspector.Common.Meta string GetGroupName(uint settingId); + string GetAlternateNames(uint settingId); + uint? GetDwordDefaultValue(uint settingId); string GetStringDefaultValue(uint settingId); diff --git a/nspector/Common/Meta/ScannedSettingMetaService.cs b/nspector/Common/Meta/ScannedSettingMetaService.cs index 25caf05..f93d1c7 100644 --- a/nspector/Common/Meta/ScannedSettingMetaService.cs +++ b/nspector/Common/Meta/ScannedSettingMetaService.cs @@ -43,6 +43,11 @@ namespace nspector.Common.Meta return null; } + public string GetAlternateNames(uint settingId) + { + return null; + } + public uint? GetDwordDefaultValue(uint settingId) { return null; diff --git a/nspector/Common/Meta/SettingMeta.cs b/nspector/Common/Meta/SettingMeta.cs index 309c711..56640b8 100644 --- a/nspector/Common/Meta/SettingMeta.cs +++ b/nspector/Common/Meta/SettingMeta.cs @@ -9,6 +9,8 @@ namespace nspector.Common.Meta public string GroupName { get; set; } + public string AlternateNames { get; set; } + public string SettingName { get; set; } public string DefaultStringValue { get; set; } diff --git a/nspector/Common/SettingItem.cs b/nspector/Common/SettingItem.cs index afedbd6..ee1aecf 100644 --- a/nspector/Common/SettingItem.cs +++ b/nspector/Common/SettingItem.cs @@ -21,6 +21,8 @@ public string GroupName { get; set; } + public string AlternateNames { get; set; } + public SettingState State { get; set; } public bool IsStringValue { get; set; } diff --git a/nspector/CustomSettingNames.xml b/nspector/CustomSettingNames.xml index 0fd7eca..c257e0f 100644 --- a/nspector/CustomSettingNames.xml +++ b/nspector/CustomSettingNames.xml @@ -1508,6 +1508,7 @@ rBAR - Enable 0x000F00BA 5 - Common + ReBAR - Enable, Resizable Bar - Enable Disabled @@ -1523,30 +1524,35 @@ rBAR - Options 0x000F00BB 5 - Common + ReBAR - Options, Resizable Bar - Options DWORD rBAR - Intel CPU Exclusion 0x00E942FC 5 - Common + ReBAR - Intel CPU Exclusion, Resizable Bar - Intel CPU Exclusion DWORD rBAR - Size Limit 0x000F00FF 5 - Common + ReBAR - Size Limit, Resizable Bar - Size Limit BINARY rBAR - Flags (0x000F00BE) 0x000F00BE 8 - Extra + ReBAR - Flags (0x000F00BE), Resizable Bar - Flags (0x000F00BE) DWORD rBAR - Flags (0x000F00BF) 0x000F00BF 8 - Extra + ReBAR - Flags (0x000F00BF), Resizable Bar - Flags (0x000F00BF) DWORD @@ -8306,6 +8312,7 @@ Vulkan/OpenGL Present Method - Flags 0x20324987 2 - Sync and Refresh + OGL_DX_PRESENT_DEBUG 0 diff --git a/nspector/Reference.xml b/nspector/Reference.xml index c9211fa..f5271c8 100644 --- a/nspector/Reference.xml +++ b/nspector/Reference.xml @@ -6439,10 +6439,11 @@ - PS_CONST_FOLDING_GPU (0x006D6197) + PS_CONST_FOLDING_GPU 0x006D6197 8 - Extra + 0x006D6197, 0x6D6197 0 diff --git a/nspector/frmDrvSettings.cs b/nspector/frmDrvSettings.cs index 5dcbca4..4005cb6 100644 --- a/nspector/frmDrvSettings.cs +++ b/nspector/frmDrvSettings.cs @@ -166,8 +166,12 @@ namespace nspector var item = CreateListViewItem(settingItem); // Apply search filter if set - if (!string.IsNullOrEmpty(searchFilter) && !item.Text.ToLowerInvariant().Contains(searchFilter)) + if (!string.IsNullOrEmpty(searchFilter) && + !item.Text.ToLowerInvariant().Contains(searchFilter) && + (settingItem.AlternateNames == null || !settingItem.AlternateNames.ToLower().Contains(searchFilter))) + { continue; + } lvSettings.Items.Add(item); @@ -296,7 +300,11 @@ namespace nspector var referenceSettings = DrsServiceLocator.ReferenceSettings?.Settings.FirstOrDefault(s => s.SettingId == settingid); - if (string.IsNullOrEmpty(settingMeta.Description) && !(referenceSettings?.HasConstraints ?? false)) + var description = settingMeta.Description; + if (!string.IsNullOrEmpty(settingMeta.AlternateNames)) + description = $"Alternate names: {settingMeta.AlternateNames}\r\n{description}"; + + if (string.IsNullOrEmpty(description) && !(referenceSettings?.HasConstraints ?? false)) { tbSettingDescription.Text = ""; tbSettingDescription.Visible = false; @@ -304,7 +312,7 @@ namespace nspector } else { - tbSettingDescription.Text = settingMeta.Description; + tbSettingDescription.Text = description; tbSettingDescription.Visible = true; tbSettingDescription.BackColor = (referenceSettings?.HasConstraints ?? false) ? Color.LightCoral : SystemColors.Control; }