Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions clean/installer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -471,8 +471,9 @@ ctest `source-size`.
against `WrongGPU.exe` unchanged; `/WIZARD` (or switches without `/S`) opens the old wizard.

**Per-game settings** (`src/wg_core/profile.*`): `<install folder>\wronggpu-setup\profile.ini` is the source of truth.
Basic tier: `wronggpu` (on | off: `[fsr] upscaler = network | amd`), `executor` (auto | dx12 | hip), `output_filter`
(default | original | analytic | quality5 | quality9; quality5/9 are WrongGPU variations), `pre_exposure` (scale |
Basic tier: `wronggpu` (on | off: `[fsr] upscaler = network | amd`), `executor` (auto | dx12; an older profile's
`hip` is dropped when the profile is read), `output_filter` (default | original | analytic | quality5 | quality9;
quality5/9 are WrongGPU variations), `pre_exposure` (scale |
original), `sparkle_guard` (off | on | a rate in (0, 1)), `fps_overlay` (keep | on | off: OptiScaler's
`[Menu] ShowFps`, written only when that key exists in the game's OptiScaler.ini). On the game page Use WrongGPU is in view; Runs on, Output filter, Pre-exposure and Sparkle guard are under
"Advanced settings (4)", shown when one of them is off its default, unsaved or changed outside the launcher (`AdvancedWanted`). Every value is checked before
Expand Down
2 changes: 1 addition & 1 deletion clean/installer/src/app/ui_checks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ void FirstRunChecks(HWND hwnd, const GlobalSettings& gs, const wstring& dll, boo
// found or not, and that it is optional (the card is the line above); the file, device and architecture go to the log
if (h.ok) LogLine(g.ctx, L"first run: HIP runtime " + h.dll + L" works on " + h.device + L" (" + h.arch + L")");
m->lines.push_back({h.ok ? 0 : 1, h.ok ? wstring(L"HIP runtime: Found (optional)")
: wstring(L"HIP runtime: Not found (optional). Only Sparkle guard and the HIP choice in Runs\u00a0on need it.")});
: wstring(L"HIP runtime: Not found (optional). Model M runs on Direct3D\u00a012 without it.")});
}
partial();
// the games first: the model's source game is named as the Library names it (the same list becomes v.games), the
Expand Down
14 changes: 7 additions & 7 deletions clean/installer/src/app/ui_dump.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -604,32 +604,32 @@ int RunLauncherUiDump(const wstring& outFile, const wstring& shotDir, bool noSca
}
j.B("found", found).End();
// the unsaved capsule closed by Discard from the keyboard: the focus goes back to the control that changed the
// setting (Sparkle guard here), not to whatever stop was nearest the capsule
// setting (Pre-exposure's Original here, an Advanced row: open above), not to whatever stop was nearest the capsule
v.edit = v.saved; v.focus = 0;
v.scroll[P_GAME] = v.target[P_GAME] = 0;
RenderFrame(fw, fh, 1, L"");
Activate(ID_G_SPARKLE);
Activate(ID_G_PRE0 + 1);
v.focus = ID_G_DISCARD; v.focusVisible = true;
RenderFrame(fw, fh, 1, L"");
const bool capsule = Dirty();
Activate(ID_G_DISCARD);
RenderFrame(fw, fh, 1, L"");
j.Key("capsule_focus").Obj().B("dirty_before", capsule).B("dirty_after", Dirty()).N("want", ID_G_SPARKLE).N("focus", v.focus).End();
j.Key("capsule_focus").Obj().B("dirty_before", capsule).B("dirty_after", Dirty()).N("want", ID_G_PRE0 + 1).N("focus", v.focus).End();
// the keyboard model: Space acts as it comes up, on the control it went down on (Tab away first: no press); a held
// arrow in a segmented control steps once; Apply refusing an OptiScaler value puts the focus on that value's field;
// a menu takes the focus to its control; a lone Alt opens no system-menu mode (Alt+Space still does); Browser Back
j.Key("keys").Obj();
v.edit = v.saved; v.optiMore = false;
v.scroll[P_GAME] = v.target[P_GAME] = 0;
RenderFrame(fw, fh, 1, L"");
v.focus = ID_G_SPARKLE; v.focusVisible = true;
v.focus = ID_G_PRE0 + 1; v.focusVisible = true; // Pre-exposure's Original (Sparkle guard is off without a D3D12 port)
OnKey(VK_SPACE, 0);
const bool spaceDown = Dirty();
SpaceUp();
const bool spaceUp = Dirty();
v.edit = v.saved;
RenderFrame(fw, fh, 1, L"");
v.focus = ID_G_SPARKLE;
v.focus = ID_G_PRE0 + 1;
OnKey(VK_SPACE, 0);
OnKey(VK_TAB, 0);
SpaceUp();
Expand Down Expand Up @@ -883,8 +883,8 @@ int RunLauncherUiDump(const wstring& outFile, const wstring& shotDir, bool noSca
return v.advOpen && runsOn;
};
j.Key("advanced").Obj().B("defaults", opened([] {}))
.B("saved_off_default", opened([] { SetSetting(v.saved, "executor", "hip", nullptr); v.edit = v.saved; }))
.B("unsaved", opened([] { SetSetting(v.edit, "sparkle_guard", v.edit.get("sparkle_guard") == "off" ? "on" : "off", nullptr); }))
.B("saved_off_default", opened([] { SetSetting(v.saved, "executor", "dx12", nullptr); v.edit = v.saved; }))
.B("unsaved", opened([] { SetSetting(v.edit, "pre_exposure", v.edit.get("pre_exposure") == "original" ? "scale" : "original", nullptr); }))
.B("outside", opened([] { v.outside.push_back({"output_filter", "analytic", "quality9"}); }))
.End();
}
Expand Down
6 changes: 3 additions & 3 deletions clean/installer/src/app/ui_game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ FindingWords WordsOf(const Finding& f) {
if (f.what == L"WrongGPU RR (from another package)") w.sub = L"It stays. WrongGPU never moves its own Ray Reconstruction plugin aside.";
break;
case Tool::Cet: case Tool::Red4ext: case Tool::Ue4ss: w.sub = L"It stays. WrongGPU doesn't touch it."; break;
case Tool::HipRuntime: w.name = L"Another HIP tool"; w.sub = L"Keep Runs on at Auto or Direct3D 12 so the two don't clash."; break;
case Tool::HipRuntime: w.name = L"Another HIP tool"; w.sub = L"It stays. WrongGPU runs on Direct3D\u00a012 in a game, not on HIP, so the two don't clash."; break;
case Tool::NrOnAmd: w.name = L"Another upscaler mod"; w.sub = L"WrongGPU doesn't install next to it and doesn't touch it."; break;
case Tool::VendorDll:
if (f.what.rfind(L"A loose ", 0) == 0) { w.name = L"Another tool's file"; w.sub = L"WrongGPU leaves it alone and never writes over it."; }
Expand Down Expand Up @@ -1218,7 +1218,7 @@ void OpenGameLog(const GameEntry& e) { OpenLater(e, true); }
// The segmented controls of the page's lists share one segment width (the widest label any of them has), so their left
// edges line up down a list. Runs on is the one exception: it names its choice the way the rest of the page does
// ("Direct3D 12": its own sentence, Last run, the header's line), so its segments take that name's width.
float PageSegW(Gfx& gx) { return SegmentW(gx, {L"Default", L"Auto", L"On", L"Off", L"HIP", L"Scale", L"Original"}); }
float PageSegW(Gfx& gx) { return SegmentW(gx, {L"Default", L"Auto", L"On", L"Off", L"Scale", L"Original"}); }

// "Turn it on in the game" (UI review #1): after an install, until the first run where Model M worked, what the player does
// in the game for WrongGPU to run: choose the upscaler there (DLSS on OptiScaler's route, FSR on the direct one; TAA or
Expand Down Expand Up @@ -2099,7 +2099,7 @@ static float FolderSection(Gfx& gx, float x, float y, float w) {
if (notOffered && f.decision == Decision::Refuse && fw.name.size() > 2 && staysOut.find(fw.name) != wstring::npos) continue;
KvOpt fo;
fo.sub = notOffered && f.decision == Decision::Refuse ? wstring() : fw.sub; // the reason is the section above's
// a warning about how WrongGPU and the tool would meet (a HIP tool's "Keep Runs on at Auto..."): moot in a game
// a warning about how WrongGPU and the tool would meet (a HIP tool's): moot in a game
// WrongGPU stays out of, where the page has no setting it could name
const bool moot = notOffered && f.decision == Decision::Warn;
if (moot) fo.sub = L"Nothing to do: WrongGPU stays out of this game.";
Expand Down
2 changes: 1 addition & 1 deletion clean/installer/src/app/ui_render.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,7 @@ int RunLauncherUiRender(const wstring& outDir, const wstring& fixtureFile, int w
v.first.open = true; v.first.busy = false; v.first.installOffer = true; v.first.choice = 1;
v.first.lines = fixtureFirstRun;
for (auto& l : v.first.lines)
if (l.second.rfind(L"HIP runtime", 0) == 0) l = {1, L"HIP runtime: Not found (optional). Only Sparkle guard and the HIP choice in Runs\u00a0on need it."};
if (l.second.rfind(L"HIP runtime", 0) == 0) l = {1, L"HIP runtime: Not found (optional). Model M runs on Direct3D\u00a012 without it."};
});
frame(L"first-run-partial", [] { // the checks arriving: the graphics card's done, the model data and the games still running
v.first.open = true; v.first.busy = true; v.first.installOffer = true; v.first.choice = 1;
Expand Down
4 changes: 2 additions & 2 deletions clean/installer/src/app/ui_settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -497,8 +497,8 @@ void PaintSettings(Gfx& gx, const Rc& area) {
[&](float ry, bool b) {
return SettingRow(gx, lx, ry, lw, b, ic::processor, L"HIP runtime",
hip.empty() ? Status{2, L"Not found", L""} : Status{0, L"Found", hipWords.empty() ? L"" : hipWords + L"."},
hip.empty() ? L"Optional. Model M runs on Direct3D\u00a012 without it. Only Sparkle guard and the HIP choice in Runs\u00a0on need it."
: L"Used by Sparkle guard and the HIP choice in Runs\u00a0on.",
hip.empty() ? L"Optional. Model M runs on Direct3D\u00a012 without it, and no game setting uses it."
: L"Not used in games: Model M runs on Direct3D\u00a012.",
{}, 0, -1, {}, 0, hipPath ? ID_S_HIPTEXT : 0, hipPath ? L"HIP runtime file: " + hip : L"");
});
section(modelRows);
Expand Down
2 changes: 1 addition & 1 deletion clean/installer/src/app/ui_words.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ wstring PlainWarning(const wstring& w) {
return wstring(w.rfind(L"Special K", 0) == 0 ? L"Special K" : L"ReShade") + L" is in this game too. If Model M switches to AMD FSR next to it, Last run shows it.";
if (Has(w, L"global injector is running")) return L"Special K's global injector is running and may load into this game too. That pair isn't tested with WrongGPU.";
if (Has(w, L"Its own HIP runtime may be loaded"))
return L"Another program in this game brings its own HIP runtime. Keep Runs on at Auto or Direct3D 12 so the two don't clash.";
return L"Another program in this game brings its own HIP runtime. WrongGPU runs on Direct3D 12 in a game, not on HIP, so the two don't clash.";
if (Has(w, L"An unknown d3d12.dll"))
return L"Another program's Direct3D 12 file is in this game's folder. WrongGPU leaves it alone; if the game doesn't start with WrongGPU, that file may be why.";
if (Has(w, L"no [Plugins] Path setting")) return L"Another mod loader in this game might start WrongGPU's plugin twice.";
Expand Down
Loading