Windows: DLSS watermark off, check script, 310.7.0 pair, shorter docs
- Set Disable.Watermark on the game path (the Linux shim already does); [DLSS] ShowWatermark = true keeps NVIDIA's stamp. - Always write d4r\d4r_nvngx.log in player mode. It was skipped when the launcher gave the game a valid stderr pipe, e.g. Steam. - Accept NVIDIA's 310.7.0 + _nvngx 32.0.15.9636 as "less tested" pins. Native kernels are still gated by PTX identity, so a different DLL falls back to translated kernels. - Add d4r-check.ps1 (ok/MISSING/note lines with a fix for each; -Report writes a bug-report ZIP) with 15 fixture tests. - package-windows-release.ps1: -Architectures subset, ships the check script, GPU registry and one GPU-query tool. - Add a shorter WINDOWS_README.txt; trim README's Windows section and merge in the RX 9060 XT / distributor-DLL notes. - Diagnostic probe accepts preset 12 (L). Tested on RX 7700 XT without a game: loader and shim start-up, K and M synthetic NGX frames with both DLL pairs (finite output, native kernels used). Not tested in a game.
This commit is contained in:
ayo committed
1 parent
df415ec828
commit
774efac524
12 files changed
+519
-70
No files matched your search
@@ -148,6 +148,11 @@ API unsigned NVSDK_NGX_D3D12_EvaluateFeature(ID3D12GraphicsCommandList* list, co
|
||||
if (!snapshot->parameters) return failure;
|
||||
d4r::win::player::apply_preset(p);
|
||||
d4r::ngx::copy_create(p, snapshot->parameters); d4r::ngx::copy_frame(p, snapshot->parameters);
|
||||
// NVIDIA's library stamps "DLSS SDK - DO NOT DISTRIBUTE" over its output unless the SDK's
|
||||
// Disable.Watermark parameter is set (the Linux shim sets it too). The game's own value is
|
||||
// not used. [DLSS] ShowWatermark = true (D4R_SHIM_WATERMARK=1) keeps the stamp.
|
||||
static const bool watermark = [] { const char* v = std::getenv("D4R_SHIM_WATERMARK"); return v && v[0] == '1'; }();
|
||||
d4r_ngx_set_int(snapshot->parameters, "Disable.Watermark", watermark ? 0 : 1);
|
||||
const char* names[] = {"Color", "Depth", "MotionVectors", "Output", "ExposureTexture"};
|
||||
const char* states[] = {"D4R.Color.State", "D4R.Depth.State", "D4R.Motion.State", "D4R.Output.State", "D4R.Exposure.State"};
|
||||
for (unsigned i = 0; i < 5; ++i) {
|
||||
|
||||
@@ -202,8 +202,8 @@ struct Args {
|
||||
else if (key == "--preset") {
|
||||
size_t end = 0;
|
||||
preset = static_cast<unsigned>(std::stoul(value, &end));
|
||||
if (end != value.size() || (preset != 5 && preset != 11 && preset != 13))
|
||||
throw std::runtime_error("preset must be 5 (E), 11 (K) or 13 (M)");
|
||||
if (end != value.size() || (preset != 5 && preset != 11 && preset != 12 && preset != 13))
|
||||
throw std::runtime_error("preset must be 5 (E), 11 (K), 12 (L) or 13 (M)");
|
||||
}
|
||||
else if (key == "--fixture-dir") fixture_dir = value;
|
||||
else if (key == "--benchmark-module") benchmark_module = value;
|
||||
|
||||
@@ -2,8 +2,13 @@
|
||||
# never shipped or committed; players copy their own.
|
||||
# dlss = nvngx_dlss.dll (d4r\nvngx_dlss.dll)
|
||||
# ngx = _nvngx.dll, NVIDIA's NGX core from a display driver (d4r\ngx\_nvngx.dll)
|
||||
# status: validated = tested on Windows hardware; anything else is accepted
|
||||
# but reported as unvalidated in d4r\d4r_nvngx.log.
|
||||
# status: validated = tested on Windows hardware by the project; anything else is
|
||||
# accepted but reported as having had less testing in d4r\d4r_nvngx.log and d4r-check.ps1.
|
||||
# Native kernels only replace DLSS code whose PTX identity matches; anything else
|
||||
# falls back to ZLUDA's translated kernels, so an accepted DLL is never run with a
|
||||
# wrong native kernel.
|
||||
# kind sha256 version status
|
||||
dlss 3975567B8943C53ACCE397F2B72380092F84F162D00B0D2C7D08A1025C563983 310.9.1 validated
|
||||
dlss 1CDFDC957CB7FC9805500CA6793F607EF2D4DBD7C967FEAC70ACA9CAF382D0C0 310.7.0 unvalidated
|
||||
ngx 66767018C36B3BAB46398DADE3ADF173DAA3730FDA75965689EA848C9BC4E79B 32.0.16.1714 validated
|
||||
ngx 0765FB7FB2B8BE28EE1F0226679D7B2636A69CACCE5A23891984978F690D81A4 32.0.15.9636 unvalidated
|
||||
@@ -22,7 +22,7 @@ struct IniEntry { std::string section, key, value; };
|
||||
struct Pin { std::string kind, sha256, version, status; };
|
||||
struct Settings {
|
||||
unsigned preset = 11; // K
|
||||
bool asyncInterop = false, validateOutput = false, verbose = false;
|
||||
bool asyncInterop = false, validateOutput = false, verbose = false, showWatermark = false;
|
||||
std::wstring cacheDir;
|
||||
};
|
||||
struct State {
|
||||
@@ -102,7 +102,8 @@ inline Settings read_settings(const std::vector<IniEntry>& ini, std::vector<std:
|
||||
if (value.empty() || value == "AUTO" || value == "K" || value == "DLSS4" || value == "11") settings.preset = 11;
|
||||
else if (value == "M" || value == "DLSS4.5" || value == "13") settings.preset = 13;
|
||||
else notes.push_back("d4r.ini: [DLSS] Model '" + entry.value + "' is not available on Windows (use K or M); using K");
|
||||
} else if (name == "interop.asyncinterop") settings.asyncInterop = flag(entry, false);
|
||||
} else if (name == "dlss.showwatermark") settings.showWatermark = flag(entry, false);
|
||||
else if (name == "interop.asyncinterop") settings.asyncInterop = flag(entry, false);
|
||||
else if (name == "debug.validateoutput") settings.validateOutput = flag(entry, false);
|
||||
else if (name == "debug.log") {
|
||||
const auto value = lower(entry.value);
|
||||
@@ -213,11 +214,9 @@ inline void set_variable(const wchar_t* name, const std::optional<std::wstring>&
|
||||
SetEnvironmentVariableW(name, value ? value->c_str() : nullptr);
|
||||
_wputenv_s(name, value ? value->c_str() : L"");
|
||||
}
|
||||
// Only when the game has no console/pipe: never steal a launcher's streams.
|
||||
inline bool unattached(DWORD stream) {
|
||||
const HANDLE current = GetStdHandle(stream);
|
||||
return !current || current == INVALID_HANDLE_VALUE;
|
||||
}
|
||||
// Player mode only runs when no launcher set up the environment, so no launcher is
|
||||
// reading these streams. A game started from Steam can have a valid but unread pipe
|
||||
// as stderr; always writing to the log keeps errors visible.
|
||||
inline void redirect(FILE* crt, DWORD stream, const std::filesystem::path& path) {
|
||||
FILE* reopened = nullptr;
|
||||
if (_wfreopen_s(&reopened, path.c_str(), L"a", crt) || !reopened) return;
|
||||
@@ -253,6 +252,7 @@ inline void apply(const std::filesystem::path& dir, const Settings& settings) {
|
||||
{L"D4R_QUIET_API", settings.verbose ? unset : on},
|
||||
{L"D4R_VALIDATE_OUTPUT", settings.validateOutput ? on : unset},
|
||||
{L"D4R_ASYNC_INTEROP", settings.asyncInterop ? on : unset},
|
||||
{L"D4R_SHIM_WATERMARK", settings.showWatermark ? on : unset},
|
||||
{L"D4R_PROFILE_STAGES", unset}, {L"D4R_ZLUDA_PROFILE", unset}, {L"D4R_ZLUDA_PROFILE_DEFERRED", unset},
|
||||
{L"D4R_ZLUDA_PROFILE_ALLOW_LEGACY", unset}, {L"D4R_ZLUDA_PROFILE_EVERY", unset},
|
||||
{L"D4R_PROFILE_COMMAND_HOOKS", unset}, {L"D4R_ZLUDA_PROFILE_API", unset}, {L"D4R_PROFILE_GPU_BOUNDARY", unset},
|
||||
@@ -278,12 +278,10 @@ inline void ensure_environment() {
|
||||
if (!std::filesystem::exists(dir / L"d4r.ini")) return; // Developer layout: keep the original requirement.
|
||||
auto& current = state(); current.dir = dir;
|
||||
const auto log = dir / L"d4r_nvngx.log";
|
||||
if (unattached(STD_ERROR_HANDLE)) {
|
||||
{ std::ofstream truncate(log, std::ios::trunc); } // Rewritten at every launch, as on Linux.
|
||||
redirect(stderr, STD_ERROR_HANDLE, log);
|
||||
}
|
||||
{ std::ofstream truncate(log, std::ios::trunc); } // Rewritten at every launch, as on Linux.
|
||||
redirect(stderr, STD_ERROR_HANDLE, log);
|
||||
const auto settings = read_settings(parse_ini(read_text(dir / L"d4r.ini")), current.notes);
|
||||
if (settings.verbose && unattached(STD_OUTPUT_HANDLE)) redirect(stdout, STD_OUTPUT_HANDLE, log);
|
||||
if (settings.verbose) redirect(stdout, STD_OUTPUT_HANDLE, log);
|
||||
const auto pins = parse_pins(read_text(dir / L"dll-pins.txt"));
|
||||
verify_dll(dir, pins, "dlss", L"nvngx_dlss.dll", "nvngx_dlss.dll", current.notes);
|
||||
verify_dll(dir, pins, "ngx", L"ngx\\_nvngx.dll", "_nvngx.dll", current.notes);
|
||||
|
||||
@@ -46,6 +46,12 @@ int wmain(int argc, wchar_t** argv) {
|
||||
s = settings("[Kernels]\nNativeFp8 = on\n[Latency]\nFrameAge = 1\n", notes);
|
||||
expect(has_note(notes, "[Kernels] NativeFp8 is not a Windows setting") && has_note(notes, "[Latency] FrameAge"),
|
||||
"Linux-only settings are reported as ignored");
|
||||
s = settings("", notes);
|
||||
expect(!s.showWatermark, "watermark is hidden by default");
|
||||
s = settings("[DLSS]\nShowWatermark = true\n", notes);
|
||||
expect(s.showWatermark && notes.empty(), "[DLSS] ShowWatermark = true keeps NVIDIA's stamp");
|
||||
s = settings("[DLSS]\nShowWatermark = sometimes\n", notes);
|
||||
expect(!s.showWatermark && has_note(notes, "ShowWatermark must be true or false"), "invalid ShowWatermark falls back to hidden with a note");
|
||||
s = settings("[Paths]\nCacheDir = D:\\d4r-cache\n", notes);
|
||||
expect(s.cacheDir == L"D:\\d4r-cache" && notes.empty(), "CacheDir path");
|
||||
|
||||
|
||||
Reference in new issue
Block a user