Update nvapi from r510 to r525 (#2839)

Author: patrikjuvonen

vendor/nvapi/NvApiDriverSettings.c

@@ -41,6 +41,8 @@
 #define _NVAPI_DRIVER_SETTINGS_H_
 
 #define OGL_AA_LINE_GAMMA_STRING                   L"Antialiasing - Line gamma"
+#define OGL_CPL_GDI_COMPATIBILITY_STRING           L"OpenGL GDI compatibility"
+#define OGL_CPL_PREFER_DXPRESENT_STRING            L"Vulkan/OpenGL present method"
 #define OGL_DEEP_COLOR_SCANOUT_STRING              L"Deep color for 3D applications"
 #define OGL_DEFAULT_SWAP_INTERVAL_STRING           L"OpenGL default swap interval"
 #define OGL_DEFAULT_SWAP_INTERVAL_FRACTIONAL_STRING L"OpenGL default swap interval fraction"
@@ -141,6 +143,8 @@
 
 enum ESetting {
     OGL_AA_LINE_GAMMA_ID                          = 0x2089BF6C,
+    OGL_CPL_GDI_COMPATIBILITY_ID                  = 0x2072C5A3,
+    OGL_CPL_PREFER_DXPRESENT_ID                   = 0x20D690F8,
     OGL_DEEP_COLOR_SCANOUT_ID                     = 0x2097C2F6,
     OGL_DEFAULT_SWAP_INTERVAL_ID                  = 0x206A6582,
     OGL_DEFAULT_SWAP_INTERVAL_FRACTIONAL_ID       = 0x206C4581,
@@ -238,9 +242,9 @@ enum ESetting {
     SET_VAB_DATA_ID                               = 0x00AB8687,
     VSYNCMODE_ID                                  = 0x00A879CF,
     VSYNCTEARCONTROL_ID                           = 0x005A375C,
-    TOTAL_DWORD_SETTING_NUM = 94,
+    TOTAL_DWORD_SETTING_NUM = 96,
     TOTAL_WSTRING_SETTING_NUM = 4,
-    TOTAL_SETTING_NUM = 98,
+    TOTAL_SETTING_NUM = 100,
     INVALID_SETTING_ID = 0xFFFFFFFF
 };
 
@@ -253,6 +257,22 @@ enum EValues_OGL_AA_LINE_GAMMA {
     OGL_AA_LINE_GAMMA_DEFAULT = OGL_AA_LINE_GAMMA_DISABLED
 };
 
+enum EValues_OGL_CPL_GDI_COMPATIBILITY {
+    OGL_CPL_GDI_COMPATIBILITY_PREFER_DISABLED            = 0x00000000,
+    OGL_CPL_GDI_COMPATIBILITY_PREFER_ENABLED             = 0x00000001,
+    OGL_CPL_GDI_COMPATIBILITY_AUTO                       = 0x00000002,
+    OGL_CPL_GDI_COMPATIBILITY_NUM_VALUES = 3,
+    OGL_CPL_GDI_COMPATIBILITY_DEFAULT = OGL_CPL_GDI_COMPATIBILITY_AUTO
+};
+
+enum EValues_OGL_CPL_PREFER_DXPRESENT {
+    OGL_CPL_PREFER_DXPRESENT_PREFER_DISABLED             = 0x00000000,
+    OGL_CPL_PREFER_DXPRESENT_PREFER_ENABLED              = 0x00000001,
+    OGL_CPL_PREFER_DXPRESENT_AUTO                        = 0x00000002,
+    OGL_CPL_PREFER_DXPRESENT_NUM_VALUES = 3,
+    OGL_CPL_PREFER_DXPRESENT_DEFAULT = OGL_CPL_PREFER_DXPRESENT_AUTO
+};
+
 enum EValues_OGL_DEEP_COLOR_SCANOUT {
     OGL_DEEP_COLOR_SCANOUT_DISABLE                       = 0,
     OGL_DEEP_COLOR_SCANOUT_ENABLE                        = 1,
@@ -278,7 +298,7 @@ enum EValues_OGL_DEFAULT_SWAP_INTERVAL_FRACTIONAL {
     OGL_DEFAULT_SWAP_INTERVAL_FRACTIONAL_ZERO_SCANLINES  = 0,
     OGL_DEFAULT_SWAP_INTERVAL_FRACTIONAL_ONE_FULL_FRAME_OF_SCANLINES = 100,
     OGL_DEFAULT_SWAP_INTERVAL_FRACTIONAL_NUM_VALUES = 2,
-    OGL_DEFAULT_SWAP_INTERVAL_FRACTIONAL_DEFAULT = 0
+    OGL_DEFAULT_SWAP_INTERVAL_FRACTIONAL_DEFAULT = 0U
 };
 
 enum EValues_OGL_DEFAULT_SWAP_INTERVAL_SIGN {
@@ -372,7 +392,7 @@ enum EValues_OGL_THREAD_CONTROL {
     OGL_THREAD_CONTROL_ENABLE                            = 0x00000001,
     OGL_THREAD_CONTROL_DISABLE                           = 0x00000002,
     OGL_THREAD_CONTROL_NUM_VALUES = 2,
-    OGL_THREAD_CONTROL_DEFAULT = 0
+    OGL_THREAD_CONTROL_DEFAULT = 0U
 };
 
 enum EValues_OGL_TMON_LEVEL {
@@ -706,62 +726,62 @@ enum EValues_PREVENT_UI_AF_OVERRIDE {
 };
 
 enum EValues_SHIM_MCCOMPAT {
-    SHIM_MCCOMPAT_INTEGRATED                             = 0x00000000,
-    SHIM_MCCOMPAT_ENABLE                                 = 0x00000001,
-    SHIM_MCCOMPAT_USER_EDITABLE                          = 0x00000002,
-    SHIM_MCCOMPAT_MASK                                   = 0x00000003,
-    SHIM_MCCOMPAT_VIDEO_MASK                             = 0x00000004,
-    SHIM_MCCOMPAT_VARYING_BIT                            = 0x00000008,
-    SHIM_MCCOMPAT_AUTO_SELECT                            = 0x00000010,
-    SHIM_MCCOMPAT_OVERRIDE_BIT                           = 0x80000000,
+    SHIM_MCCOMPAT_INTEGRATED                             = 0x00000000U,
+    SHIM_MCCOMPAT_ENABLE                                 = 0x00000001U,
+    SHIM_MCCOMPAT_USER_EDITABLE                          = 0x00000002U,
+    SHIM_MCCOMPAT_MASK                                   = 0x00000003U,
+    SHIM_MCCOMPAT_VIDEO_MASK                             = 0x00000004U,
+    SHIM_MCCOMPAT_VARYING_BIT                            = 0x00000008U,
+    SHIM_MCCOMPAT_AUTO_SELECT                            = 0x00000010U,
+    SHIM_MCCOMPAT_OVERRIDE_BIT                           = 0x80000000U,
     SHIM_MCCOMPAT_NUM_VALUES = 8,
     SHIM_MCCOMPAT_DEFAULT = SHIM_MCCOMPAT_AUTO_SELECT
 };
 
 enum EValues_SHIM_RENDERING_MODE {
-    SHIM_RENDERING_MODE_INTEGRATED                       = 0x00000000,
-    SHIM_RENDERING_MODE_ENABLE                           = 0x00000001,
-    SHIM_RENDERING_MODE_USER_EDITABLE                    = 0x00000002,
-    SHIM_RENDERING_MODE_MASK                             = 0x00000003,
-    SHIM_RENDERING_MODE_VIDEO_MASK                       = 0x00000004,
-    SHIM_RENDERING_MODE_VARYING_BIT                      = 0x00000008,
-    SHIM_RENDERING_MODE_AUTO_SELECT                      = 0x00000010,
-    SHIM_RENDERING_MODE_OVERRIDE_BIT                     = 0x80000000,
+    SHIM_RENDERING_MODE_INTEGRATED                       = 0x00000000U,
+    SHIM_RENDERING_MODE_ENABLE                           = 0x00000001U,
+    SHIM_RENDERING_MODE_USER_EDITABLE                    = 0x00000002U,
+    SHIM_RENDERING_MODE_MASK                             = 0x00000003U,
+    SHIM_RENDERING_MODE_VIDEO_MASK                       = 0x00000004U,
+    SHIM_RENDERING_MODE_VARYING_BIT                      = 0x00000008U,
+    SHIM_RENDERING_MODE_AUTO_SELECT                      = 0x00000010U,
+    SHIM_RENDERING_MODE_OVERRIDE_BIT                     = 0x80000000U,
     SHIM_RENDERING_MODE_NUM_VALUES = 8,
     SHIM_RENDERING_MODE_DEFAULT = SHIM_RENDERING_MODE_AUTO_SELECT
 };
 
 enum EValues_SHIM_RENDERING_OPTIONS {
-    SHIM_RENDERING_OPTIONS_DEFAULT_RENDERING_MODE        = 0x00000000,
-    SHIM_RENDERING_OPTIONS_DISABLE_ASYNC_PRESENT         = 0x00000001,
-    SHIM_RENDERING_OPTIONS_EHSHELL_DETECT                = 0x00000002,
-    SHIM_RENDERING_OPTIONS_FLASHPLAYER_HOST_DETECT       = 0x00000004,
-    SHIM_RENDERING_OPTIONS_VIDEO_DRM_APP_DETECT          = 0x00000008,
-    SHIM_RENDERING_OPTIONS_IGNORE_OVERRIDES              = 0x00000010,
-    SHIM_RENDERING_OPTIONS_RESERVED1                     = 0x00000020,
-    SHIM_RENDERING_OPTIONS_ENABLE_DWM_ASYNC_PRESENT      = 0x00000040,
-    SHIM_RENDERING_OPTIONS_RESERVED2                     = 0x00000080,
-    SHIM_RENDERING_OPTIONS_ALLOW_INHERITANCE             = 0x00000100,
-    SHIM_RENDERING_OPTIONS_DISABLE_WRAPPERS              = 0x00000200,
-    SHIM_RENDERING_OPTIONS_DISABLE_DXGI_WRAPPERS         = 0x00000400,
-    SHIM_RENDERING_OPTIONS_PRUNE_UNSUPPORTED_FORMATS     = 0x00000800,
-    SHIM_RENDERING_OPTIONS_ENABLE_ALPHA_FORMAT           = 0x00001000,
-    SHIM_RENDERING_OPTIONS_IGPU_TRANSCODING              = 0x00002000,
-    SHIM_RENDERING_OPTIONS_DISABLE_CUDA                  = 0x00004000,
-    SHIM_RENDERING_OPTIONS_ALLOW_CP_CAPS_FOR_VIDEO       = 0x00008000,
-    SHIM_RENDERING_OPTIONS_IGPU_TRANSCODING_FWD_OPTIMUS  = 0x00010000,
-    SHIM_RENDERING_OPTIONS_DISABLE_DURING_SECURE_BOOT    = 0x00020000,
-    SHIM_RENDERING_OPTIONS_INVERT_FOR_QUADRO             = 0x00040000,
-    SHIM_RENDERING_OPTIONS_INVERT_FOR_MSHYBRID           = 0x00080000,
-    SHIM_RENDERING_OPTIONS_REGISTER_PROCESS_ENABLE_GOLD  = 0x00100000,
-    SHIM_RENDERING_OPTIONS_HANDLE_WINDOWED_MODE_PERF_OPT = 0x00200000,
-    SHIM_RENDERING_OPTIONS_HANDLE_WIN7_ASYNC_RUNTIME_BUG = 0x00400000,
-    SHIM_RENDERING_OPTIONS_EXPLICIT_ADAPTER_OPTED_BY_APP = 0x00800000,
-    SHIM_RENDERING_OPTIONS_ALLOW_DYNAMIC_DISPLAY_MUX_SWITCH = 0x01000000,
-    SHIM_RENDERING_OPTIONS_DISALLOW_DYNAMIC_DISPLAY_MUX_SWITCH = 0x02000000,
-    SHIM_RENDERING_OPTIONS_DISABLE_TURING_POWER_POLICY   = 0x04000000,
+    SHIM_RENDERING_OPTIONS_DEFAULT_RENDERING_MODE        = 0x00000000U,
+    SHIM_RENDERING_OPTIONS_DISABLE_ASYNC_PRESENT         = 0x00000001U,
+    SHIM_RENDERING_OPTIONS_EHSHELL_DETECT                = 0x00000002U,
+    SHIM_RENDERING_OPTIONS_FLASHPLAYER_HOST_DETECT       = 0x00000004U,
+    SHIM_RENDERING_OPTIONS_VIDEO_DRM_APP_DETECT          = 0x00000008U,
+    SHIM_RENDERING_OPTIONS_IGNORE_OVERRIDES              = 0x00000010U,
+    SHIM_RENDERING_OPTIONS_RESERVED1                     = 0x00000020U,
+    SHIM_RENDERING_OPTIONS_ENABLE_DWM_ASYNC_PRESENT      = 0x00000040U,
+    SHIM_RENDERING_OPTIONS_RESERVED2                     = 0x00000080U,
+    SHIM_RENDERING_OPTIONS_ALLOW_INHERITANCE             = 0x00000100U,
+    SHIM_RENDERING_OPTIONS_DISABLE_WRAPPERS              = 0x00000200U,
+    SHIM_RENDERING_OPTIONS_DISABLE_DXGI_WRAPPERS         = 0x00000400U,
+    SHIM_RENDERING_OPTIONS_PRUNE_UNSUPPORTED_FORMATS     = 0x00000800U,
+    SHIM_RENDERING_OPTIONS_ENABLE_ALPHA_FORMAT           = 0x00001000U,
+    SHIM_RENDERING_OPTIONS_IGPU_TRANSCODING              = 0x00002000U,
+    SHIM_RENDERING_OPTIONS_DISABLE_CUDA                  = 0x00004000U,
+    SHIM_RENDERING_OPTIONS_ALLOW_CP_CAPS_FOR_VIDEO       = 0x00008000U,
+    SHIM_RENDERING_OPTIONS_IGPU_TRANSCODING_FWD_OPTIMUS  = 0x00010000U,
+    SHIM_RENDERING_OPTIONS_DISABLE_DURING_SECURE_BOOT    = 0x00020000U,
+    SHIM_RENDERING_OPTIONS_INVERT_FOR_QUADRO             = 0x00040000U,
+    SHIM_RENDERING_OPTIONS_INVERT_FOR_MSHYBRID           = 0x00080000U,
+    SHIM_RENDERING_OPTIONS_REGISTER_PROCESS_ENABLE_GOLD  = 0x00100000U,
+    SHIM_RENDERING_OPTIONS_HANDLE_WINDOWED_MODE_PERF_OPT = 0x00200000U,
+    SHIM_RENDERING_OPTIONS_HANDLE_WIN7_ASYNC_RUNTIME_BUG = 0x00400000U,
+    SHIM_RENDERING_OPTIONS_EXPLICIT_ADAPTER_OPTED_BY_APP = 0x00800000U,
+    SHIM_RENDERING_OPTIONS_ALLOW_DYNAMIC_DISPLAY_MUX_SWITCH = 0x01000000U,
+    SHIM_RENDERING_OPTIONS_DISALLOW_DYNAMIC_DISPLAY_MUX_SWITCH = 0x02000000U,
+    SHIM_RENDERING_OPTIONS_DISABLE_TURING_POWER_POLICY   = 0x04000000U,
     SHIM_RENDERING_OPTIONS_NUM_VALUES = 28,
-    SHIM_RENDERING_OPTIONS_DEFAULT = 0x00000000
+    SHIM_RENDERING_OPTIONS_DEFAULT = 0x00000000U
 };
 
 enum EValues_SLI_GPU_COUNT {