Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c3c0e9a525 | |||
| 6541727419 | |||
| 4bbee94388 | |||
| a36ce6ea76 | |||
| db472789d3 | |||
| f95ab007d2 | |||
| 0ea0c4a94c | |||
| 09863ad9e3 | |||
| c82f2b9e52 | |||
| 49a8644d13 |
@@ -0,0 +1,77 @@
|
||||
name: Commit V36 Retail Soft decode
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- test/v36-retail-jfa-soft
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
commit-v36-soft:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: test/v36-retail-jfa-soft
|
||||
|
||||
- name: Apply V36 decode
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
python3 <<'PY'
|
||||
from pathlib import Path
|
||||
p = Path('src/outline/d3d9_hook.zig')
|
||||
s = p.read_text()
|
||||
if 'V36 RETAIL-SOFT' in s:
|
||||
raise SystemExit(0)
|
||||
start = s.index('/// V32 POLISH: hard 3px outline, no feather.')
|
||||
end = s.index('/// Debug: composite silhouette RT directly.')
|
||||
lines = [
|
||||
'/// V36 RETAIL-SOFT: keep the proven V34 JFA, soften only final decode.',
|
||||
'/// c0 = (screen_width, screen_height, core_radius_px, halo_radius_px).',
|
||||
'/// Uses the same two texture reads as V34: no 17-tap full-screen morphology.',
|
||||
'const jfa_decode_src =',
|
||||
' "ps_3_0\\n" ++',
|
||||
' "def c1, 0.0, 0.22, 0.82, -0.002\\n" ++',
|
||||
' "def c2, 1.0, 0.95, 0.58, 0.0\\n" ++',
|
||||
' "dcl_2d s0\\n" ++',
|
||||
' "dcl_2d s1\\n" ++',
|
||||
' "dcl_texcoord0 v0\\n" ++',
|
||||
' "texld r0, v0, s0\\n" ++',
|
||||
' "sub r1.xy, v0.xy, r0.xy\\n" ++',
|
||||
' "mul r1.xy, r1.xy, c0.xy\\n" ++',
|
||||
' "dp2add r1.z, r1, r1, c1.x\\n" ++',
|
||||
' "mul r3.x, c0.z, c0.z\\n" ++',
|
||||
' "mul r3.y, c0.w, c0.w\\n" ++',
|
||||
' "sub r4.x, r1.z, r3.y\\n" ++',
|
||||
' "cmp r6.w, r4.x, c1.x, c1.y\\n" ++',
|
||||
' "sub r4.x, r1.z, r3.x\\n" ++',
|
||||
' "cmp r6.w, r4.x, r6.w, c1.z\\n" ++',
|
||||
' "texld r5, v0, s1\\n" ++',
|
||||
' "add r5.x, r5.a, c1.w\\n" ++',
|
||||
' "cmp r6.w, r5.x, c1.x, r6.w\\n" ++',
|
||||
' "mov r6.xyz, c2.xyz\\n" ++',
|
||||
' "mov oC0, r6\\n";',
|
||||
'',
|
||||
'',
|
||||
]
|
||||
s = s[:start] + '\n'.join(lines) + s[end:]
|
||||
old = ' // V34: hard 3px edge unchanged; JFA seed precision is now full-float.\n c0 = [4]f32{ fw, fh, 3.0, 0.0 };'
|
||||
new_cpu = ' // V36: thin 1.5px core plus a subtle 3px halo.\n c0 = [4]f32{ fw, fh, 1.5, 3.0 };'
|
||||
if old not in s:
|
||||
raise SystemExit('V34 CPU decode constants not found')
|
||||
p.write_text(s.replace(old, new_cpu))
|
||||
PY
|
||||
|
||||
- name: Commit source
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
if git diff --quiet; then exit 0; fi
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git add src/outline/d3d9_hook.zig
|
||||
git commit -m "V36: soft Retail-style JFA decode"
|
||||
git push origin HEAD:test/v36-retail-jfa-soft
|
||||
@@ -0,0 +1,55 @@
|
||||
name: V36 ExitFix Baseline
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- test/v36-exitfix-baseline
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- uses: mlugg/setup-zig@v2
|
||||
with:
|
||||
version: '0.16.0'
|
||||
|
||||
- name: Build
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
zig build all-variants -Doptimize=ReleaseSmall \
|
||||
-Dweirdperformance=false \
|
||||
-Doutline=true \
|
||||
-Dcustomassets=true \
|
||||
-Dtransmogfix=true
|
||||
|
||||
- name: Package
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
rm -rf package dist
|
||||
mkdir -p package/DLL package/Interface/AddOns/WeirdUtils_Outline dist
|
||||
cp zig-out/variants/outline.dll package/DLL/outline.dll
|
||||
cp src/outline/addon/Bindings.xml package/Interface/AddOns/WeirdUtils_Outline/
|
||||
cp src/outline/addon/Outline.lua package/Interface/AddOns/WeirdUtils_Outline/
|
||||
cp src/outline/addon/WeirdUtils_Outline.toc package/Interface/AddOns/WeirdUtils_Outline/
|
||||
printf '%s\n' \
|
||||
'V36 runtime + process-exit safety only.' \
|
||||
'Base runtime commit: 4bbee94388f98843b738e275fd9482576be80654.' \
|
||||
'Compared with V34, only src/outline/d3d9_hook.zig changes runtime behavior.' \
|
||||
'main branch is untouched.' \
|
||||
'WeirdPerformance is disabled in this standalone build and not modified.' \
|
||||
> package/README_TEST.txt
|
||||
(cd package && sha256sum DLL/outline.dll > SHA256SUMS.txt && zip -r ../dist/WeirdUtils_V36_EXITFIX_BASELINE.zip DLL Interface README_TEST.txt SHA256SUMS.txt)
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: WeirdUtils-V36-EXITFIX-BASELINE
|
||||
path: dist/WeirdUtils_V36_EXITFIX_BASELINE.zip
|
||||
if-no-files-found: error
|
||||
+5
-2
@@ -1048,11 +1048,14 @@ comptime {
|
||||
pub export fn DllMain(
|
||||
_: ?*anyopaque,
|
||||
reason: u32,
|
||||
_: ?*anyopaque,
|
||||
reserved: ?*anyopaque,
|
||||
) callconv(WINAPI) std.os.windows.BOOL {
|
||||
switch (reason) {
|
||||
1 => install(),
|
||||
0 => uninstall(),
|
||||
0 => {
|
||||
// Process-exit safety only; runtime Outline behavior is unchanged.
|
||||
if (reserved == null) uninstall();
|
||||
},
|
||||
else => {},
|
||||
}
|
||||
return @enumFromInt(1);
|
||||
|
||||
+18
-21
@@ -732,34 +732,31 @@ const jfa_prop_src =
|
||||
"mov oC0.xy, r8.xy\n" ++
|
||||
"mov oC0.zw, c1.xx\n";
|
||||
|
||||
/// V32 POLISH: hard 3px outline, no feather.
|
||||
/// c0 = (screen_width, screen_height, radius_px=3, 0).
|
||||
/// The shader squares radius_px and emits a binary 0/1 edge alpha.
|
||||
/// V36 RETAIL-SOFT: keep the proven V34 JFA, soften only final decode.
|
||||
/// c0 = (screen_width, screen_height, core_radius_px, halo_radius_px).
|
||||
/// Uses the same two texture reads as V34: no 17-tap full-screen morphology.
|
||||
const jfa_decode_src =
|
||||
"ps_3_0\n" ++
|
||||
"def c1, 0.0, 1.0, -0.002, 0.0\n" ++
|
||||
"def c1, 0.0, 0.22, 0.82, -0.002\n" ++
|
||||
"def c2, 1.0, 0.95, 0.58, 0.0\n" ++
|
||||
"dcl_2d s0\n" ++
|
||||
"dcl_2d s1\n" ++
|
||||
"dcl_texcoord0 v0\n" ++
|
||||
// Nearest seed and pixel-space squared distance.
|
||||
"texld r0, v0, s0\n" ++
|
||||
"sub r1.xy, v0.xy, r0.xy\n" ++
|
||||
"mul r1.xy, r1.xy, c0.xy\n" ++
|
||||
"dp2add r1.z, r1, r1, c0.w\n" ++
|
||||
// Seed colour.
|
||||
"texld r2, r0, s1\n" ++
|
||||
// Hard radius test: dist² < radius² => alpha 1, otherwise 0.
|
||||
"mov r3.x, c0.z\n" ++
|
||||
"mul r3.x, r3.x, r3.x\n" ++
|
||||
"sub r3.y, r1.z, r3.x\n" ++
|
||||
"mov r6.w, c1.y\n" ++
|
||||
"cmp r4.w, r3.y, c0.w, r6.w\n" ++
|
||||
// Do not paint over the model interior.
|
||||
"dp2add r1.z, r1, r1, c1.x\n" ++
|
||||
"mul r3.x, c0.z, c0.z\n" ++
|
||||
"mul r3.y, c0.w, c0.w\n" ++
|
||||
"sub r4.x, r1.z, r3.y\n" ++
|
||||
"cmp r6.w, r4.x, c1.x, c1.y\n" ++
|
||||
"sub r4.x, r1.z, r3.x\n" ++
|
||||
"cmp r6.w, r4.x, r6.w, c1.z\n" ++
|
||||
"texld r5, v0, s1\n" ++
|
||||
"add r5.x, r5.a, c1.z\n" ++
|
||||
"cmp r4.w, r5.x, c0.w, r4.w\n" ++
|
||||
"mov r4.xyz, r2.xyz\n" ++
|
||||
"mov oC0, r4\n";
|
||||
"add r5.x, r5.a, c1.w\n" ++
|
||||
"cmp r6.w, r5.x, c1.x, r6.w\n" ++
|
||||
"mov r6.xyz, c2.xyz\n" ++
|
||||
"mov oC0, r6\n";
|
||||
|
||||
/// Debug: composite silhouette RT directly. Forces alpha to 1.0 where silhouette
|
||||
/// has any content (alpha >= 0.002), 0.0 elsewhere. Bypasses JFA entirely.
|
||||
@@ -1417,8 +1414,8 @@ fn runJfaPipeline(device: *anyopaque) void {
|
||||
if (saved_rt0) |rt| deviceSetRenderTarget(device, 0, rt);
|
||||
deviceSetTexture(device, 0, rt_jfa_a_tex);
|
||||
deviceSetTexture(device, 1, rt_silhouette_tex);
|
||||
// V34: hard 3px edge unchanged; JFA seed precision is now full-float.
|
||||
c0 = [4]f32{ fw, fh, 3.0, 0.0 };
|
||||
// V36: thin 1.5px core plus a subtle 3px halo.
|
||||
c0 = [4]f32{ fw, fh, 1.5, 3.0 };
|
||||
deviceSetPSConstF(device, 0, &c0);
|
||||
deviceSetPtr(device, types.VT.SetPixelShader, jfa_decode_ps.?);
|
||||
deviceSetRS(device, types.D3DRS.ALPHABLENDENABLE, 1);
|
||||
|
||||
Reference in New Issue
Block a user