diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/cpu_features.cpp | 6 | ||||
| -rw-r--r-- | src/common/fs/fs_paths.h | 1 | ||||
| -rw-r--r-- | src/common/fs/path_util.cpp | 1 | ||||
| -rw-r--r-- | src/common/fs/path_util.h | 1 | ||||
| -rw-r--r-- | src/common/scm_rev.cpp.in | 1 | ||||
| -rw-r--r-- | src/common/settings.h | 2 |
6 files changed, 10 insertions, 2 deletions
diff --git a/src/common/cpu_features.cpp b/src/common/cpu_features.cpp index 93eecb1dc5..c7f6e6f036 100644 --- a/src/common/cpu_features.cpp +++ b/src/common/cpu_features.cpp @@ -227,8 +227,10 @@ const CPUCaps g_cpu_caps = [] { // AMD CPUs have no leaf 0x15 (Zen 4 stops at 0x10): measure their invariant TSC too, or every // guest clock read (CNTPCT, which games read thousands of times a frame) goes through the - // host's much slower QueryPerformanceCounter. - if (caps.invariant_tsc && caps.tsc_frequency == 0) { + // host's much slower QueryPerformanceCounter. Intel CPUs that have the leaf but report no + // crystal frequency (e.g. Coffee Lake) keep the OS clock: an i5-9400F crashed at launch on the + // measured RDTSC clock. + if (max_std_fn < 0x15 && caps.invariant_tsc && caps.tsc_frequency == 0) { caps.tsc_frequency = X64::EstimateRDTSCFrequency(); } diff --git a/src/common/fs/fs_paths.h b/src/common/fs/fs_paths.h index ae25846fc2..763a8759dd 100644 --- a/src/common/fs/fs_paths.h +++ b/src/common/fs/fs_paths.h @@ -28,6 +28,7 @@ #define SCREENSHOTS_DIR "screenshots" #define SDMC_DIR "sdmc" #define SHADER_DIR "shader" +#define STREAMLINE_DIR "streamline" #define TAS_DIR "tas" #define ICONS_DIR "icons" diff --git a/src/common/fs/path_util.cpp b/src/common/fs/path_util.cpp index 82ea8f6cb2..f77da2e301 100644 --- a/src/common/fs/path_util.cpp +++ b/src/common/fs/path_util.cpp @@ -168,6 +168,7 @@ public: GenerateEdenPath(EdenPath::SDMCDir, eden_path / SDMC_DIR); GenerateEdenPath(EdenPath::TASDir, eden_path / TAS_DIR); GenerateEdenPath(EdenPath::IconsDir, eden_path / ICONS_DIR); + GenerateEdenPath(EdenPath::StreamlineDir, eden_path / STREAMLINE_DIR); // config GenerateEdenPath(EdenPath::ConfigDir, eden_path_config); // cache diff --git a/src/common/fs/path_util.h b/src/common/fs/path_util.h index e8fa5614ae..940dbb9186 100644 --- a/src/common/fs/path_util.h +++ b/src/common/fs/path_util.h @@ -34,6 +34,7 @@ enum class EdenPath { ShaderDir, // Where shaders are stored. TASDir, // Where TAS scripts are stored. IconsDir, // Where Icons for Windows shortcuts are stored. + StreamlineDir, // Where the user-supplied NVIDIA Streamline loader is stored. }; // migration/compat dirs diff --git a/src/common/scm_rev.cpp.in b/src/common/scm_rev.cpp.in index 21e58e24b5..5fe066d7d9 100644 --- a/src/common/scm_rev.cpp.in +++ b/src/common/scm_rev.cpp.in @@ -13,6 +13,7 @@ #define BUILD_DATE "@BUILD_DATE@" #define BUILD_FULLNAME "@BUILD_FULLNAME@" #define BUILD_VERSION "@BUILD_VERSION@" +#undef BUILD_ID #define BUILD_ID "@BUILD_ID@" #define TITLE_BAR_FORMAT_IDLE "@TITLE_BAR_FORMAT_IDLE@" #define TITLE_BAR_FORMAT_RUNNING "@TITLE_BAR_FORMAT_RUNNING@" diff --git a/src/common/settings.h b/src/common/settings.h index 6669f98f4c..dc442a7180 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -378,6 +378,8 @@ struct Values { Specialization::Percentage, true, true}; + // NVIDIA DLSS (through NVIDIA Streamline) in place of a game's DLSS. + SwitchableSetting<bool> nvidia_dlss{linkage, false, "nvidia_dlss", Category::Renderer}; SwitchableSetting<AspectRatio, true> aspect_ratio{linkage, AspectRatio::R16_9, "aspect_ratio", |