SQUASHME: fetch nv driver vsync override.

Author: abaire

thirdparty/nvapi/nvapi.c

@@ -89,7 +89,7 @@ void nvapi_finalize(void)
     }
 }
 
-bool nvapi_setup_profile(NvApiProfileOpts opts)
+bool nvapi_setup_profile(NvApiProfileOpts opts, NvApiProfileState *active_state)
 {
     if (g_hnvapi == NULL) {
         return false;
@@ -138,6 +138,27 @@ bool nvapi_setup_profile(NvApiProfileOpts opts)
         LOG("Added application to profile");
     }
 
+    NVDRS_SETTING vsync_setting = {
+        .version = NVDRS_SETTING_VER,
+    };
+    if (NvAPI_DRS_GetSetting(session, profile, VSYNCMODE_ID, &vsync_setting)) {
+        LOG("NvAPI_DRS_GetSetting for settingId %x failed", VSYNCMODE_ID);
+        active_state->vsync_mode = VSYNC_MODE_APP_CONTROLLED;
+    } else {
+        switch (vsync_setting.u32CurrentValue) {
+        case VSYNCMODE_PASSIVE:
+            active_state->vsync_mode = VSYNC_MODE_APP_CONTROLLED;
+            break;
+        case VSYNCMODE_FORCEOFF:
+        case VSYNCMODE_VIRTUAL:
+            active_state->vsync_mode = VSYNC_MODE_FORCE_OFF;
+            break;
+        default:
+            active_state->vsync_mode = VSYNC_MODE_FORCE_ON;
+            break;
+        }
+    }
+
     NVDRS_SETTING setting = {
         .version = NVDRS_SETTING_VER,
         .settingId = OGL_THREAD_CONTROL_ID,

thirdparty/nvapi/nvapi.h

@@ -33,8 +33,19 @@ typedef struct NvApiProfileOpts {
     bool threaded_optimization;
 } NvApiProfileOpts;
 
+typedef enum NvApiVsyncMode {
+    VSYNC_MODE_APP_CONTROLLED,
+    VSYNC_MODE_FORCE_OFF,
+    VSYNC_MODE_FORCE_ON,
+} NvApiVsyncMode;
+
+typedef struct NvApiProfileState {
+    NvApiVsyncMode vsync_mode;
+} NvApiProfileState;
+
 bool nvapi_init(void);
-bool nvapi_setup_profile(NvApiProfileOpts opts);
+bool nvapi_setup_profile(NvApiProfileOpts opts,
+                         NvApiProfileState *active_state);
 void nvapi_finalize(void);
 
 #endif

thirdparty/nvapi/nvapi_defs.h

@@ -32,6 +32,7 @@
 
 enum ESetting {
     OGL_THREAD_CONTROL_ID = 0x20C1221E,
+    VSYNCMODE_ID          = 0x00A879CF,
 };
 
 enum EValues_OGL_THREAD_CONTROL {
@@ -41,6 +42,18 @@ enum EValues_OGL_THREAD_CONTROL {
     OGL_THREAD_CONTROL_DEFAULT = 0U
 };
 
+enum EValues_VSYNCMODE {
+    VSYNCMODE_PASSIVE                                    = 0x60925292,
+    VSYNCMODE_FORCEOFF                                   = 0x08416747,
+    VSYNCMODE_FORCEON                                    = 0x47814940,
+    VSYNCMODE_FLIPINTERVAL2                              = 0x32610244,
+    VSYNCMODE_FLIPINTERVAL3                              = 0x71271021,
+    VSYNCMODE_FLIPINTERVAL4                              = 0x13245256,
+    VSYNCMODE_VIRTUAL                                    = 0x18888888,
+    VSYNCMODE_NUM_VALUES = 7,
+    VSYNCMODE_DEFAULT = VSYNCMODE_PASSIVE
+};
+
 typedef uint32_t NvU32;
 typedef uint16_t NvU16;
 typedef uint8_t NvU8;
@@ -223,6 +236,7 @@ typedef NVDRS_PROFILE_V1         NVDRS_PROFILE;
     FUNC(NvAPI_DRS_LoadSettings, 0x375DBD6B)       \
     FUNC(NvAPI_DRS_SaveSettings, 0xFCBC7E14)       \
     FUNC(NvAPI_DRS_SetSetting, 0x577DD202)         \
+    FUNC(NvAPI_DRS_GetSetting, 0x73BF8338)         \
     FUNC(NvAPI_Initialize, 0x0150E828)             \
     FUNC(NvAPI_Unload, 0xD22BDD7E)
 
@@ -235,6 +249,7 @@ typedef int(__cdecl *NvAPI_DRS_GetApplicationInfo_t)(NvDRSSessionHandle, NvDRSPr
 typedef int(__cdecl *NvAPI_DRS_LoadSettings_t)(NvDRSSessionHandle);
 typedef int(__cdecl *NvAPI_DRS_SaveSettings_t)(NvDRSSessionHandle);
 typedef int(__cdecl *NvAPI_DRS_SetSetting_t)(NvDRSSessionHandle, NvDRSProfileHandle, NVDRS_SETTING *);
+typedef int(__cdecl *NvAPI_DRS_GetSetting_t)(NvDRSSessionHandle, NvDRSProfileHandle, NvU32, NVDRS_SETTING *);
 typedef int(__cdecl *NvAPI_Initialize_t)(void);
 typedef int(__cdecl *NvAPI_Unload_t)(void);
 typedef void *(__cdecl *NvAPI_QueryInterface_t)(unsigned int interface_id);

ui/xemu.c

@@ -802,6 +802,13 @@ static void report_stats(void)
 #define VSYNC_SWAP_GRACE_PERIOD_NS 300000LL
 static int64_t display_vsync_interval = 1000000000LL / 60;
 
+enum VsyncOverrideBehavior {
+    VOB_FORCE_OFF,
+    VOB_FORCE_ON,
+    VOB_NO_OVERRIDE,
+};
+static enum VsyncOverrideBehavior vsync_override = VOB_NO_OVERRIDE;
+
 /**
  * Renders the main interface. Usually called from the main thread,
  * but may sometimes be called from another thread.
@@ -868,7 +875,9 @@ static void gl_render_frame(struct xemu_console *scon)
     nv2a_release_framebuffer_surface();
 
     static int64_t last_ui_frame_time_ns = 0;
-    if (g_config.display.window.vsync && last_ui_frame_time_ns) {
+    if (last_ui_frame_time_ns &&
+        (vsync_override == VOB_FORCE_ON || (vsync_override == VOB_NO_OVERRIDE &&
+                                            g_config.display.window.vsync))) {
         int64_t next_frame = last_ui_frame_time_ns + display_vsync_interval -
                              VSYNC_SWAP_GRACE_PERIOD_NS;
 
@@ -1292,12 +1301,23 @@ static void setup_nvidia_profile(void)
     }
 
     if (nvapi_init()) {
-        nvapi_setup_profile((NvApiProfileOpts){
-            .profile_name = L"xemu",
-            .executable_name = exe_name,
-            .threaded_optimization = false,
-        });
+        NvApiProfileState current_state;
+        nvapi_setup_profile(
+            (NvApiProfileOpts){
+                .profile_name = L"xemu",
+                .executable_name = exe_name,
+                .threaded_optimization = false,
+            },
+            &current_state);
         nvapi_finalize();
+
+        if (current_state.vsync_mode == VSYNC_MODE_FORCE_OFF) {
+            vsync_override = VOB_FORCE_OFF;
+        } else if (current_state.vsync_mode == VSYNC_MODE_FORCE_ON) {
+            vsync_override = VOB_FORCE_ON;
+        } else {
+            vsync_override = VOB_NO_OVERRIDE;
+        }
     }
 }
 #endif