From 5a0a7ec4e030dfc76af53fdeb62479ef51369c2f Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Fri, 29 May 2026 22:42:54 +0100 Subject: [PATCH] Add TubeField native replay validation --- .../fensalir-native-domain-reservoirs.pdf | Bin 883803 -> 884102 bytes .../fensalir-native-domain-reservoirs.tex | 21 ++- docs/papers/fensalir-pipeline.pdf | Bin 397040 -> 397338 bytes docs/papers/fensalir-pipeline.tex | 24 +-- docs/perfect-fensalir-machine-roadmap.md | 17 +- src/Aquarium.Engine/Render/D3D12Renderer.cs | 31 +++- .../Render/Shaders/D3D12Post.hlsl | 150 +++++++++++++++++- .../Render/Shaders/D3D12TubeField.hlsl | 2 +- state/evidence.jsonl | 1 + state/map.yaml | 26 +-- state/scratch.md | 16 +- 11 files changed, 246 insertions(+), 42 deletions(-) diff --git a/docs/papers/fensalir-native-domain-reservoirs.pdf b/docs/papers/fensalir-native-domain-reservoirs.pdf index c4bfbf3f38c176eae5c62fa2145c56c1e065d199..b59881948c4a36d4a9f47a6d11c995c01cfa77e6 100644 GIT binary patch delta 8840 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 K%IccxG5;S4FXS-* delta 17425 zcmai52RN1Q`**Ag*(+rgC5p30LiR{RQ8tAT60$iWl|4>%%*xKns#LNgC95(rLfJBk z%;^89@3(Kg@9(<)uFG{^_j#W8zMp%3?)!Zu-sPW5;V;@9O^3lFse1ef33A1bCf8oI zulEb9Ir6WIAcOfRJ;7#=^fjF%cbc@+zqHa|sWbNIl@Y?<#<1npMw_Lf`HA78uc zrVm8N&i0Wi=Re(Sttz}wh$n=)(+>2m_EtZUJMbv#y1qF}wXwi0i6q>w@Lj}w z-Fpoq62AZIi-#;{mMmD}++sAyoMmT@Kc?BX4eS3SHe8A3MqJgeda1#CZDm~Uh~6;3U9dMw6m3TJ@0OuR?!((4bUiiUg~4KcDpZV zN&I$oa3LmvW-+cRK|2|<j`$Zs<8Eh$gT< z3cfkfc`%f+N49cy^4g)oK)n+;Mf4>y*TUM|3KI3_`=7Qay!SLvrZUw_7GD<;zeC9V zu5yiQ`VQCYJK@&eEWy=I?&sU&E$ql91V--qRozVA$X$#x_h+{{FMAGeA=q?me?DoN znsbq^;ld@lRfLr1DCQ$3V>+DnWR^+R#zymYM7O?w0>{?F8ke0kjdV45Vvo;HabnMR z>{DJUwQp`2wsk)c_;B*BZjg_*{H35aiYS(sU#Ik7z%ebmLyt|JPfdxi$F2$Vk?As) zuaF;n8xwQ=VOEggGCRG)$Gk~YsJZsiBh^*fO5Tf({o^GJUy|lUneFbT#96=GuV#p6 z9KYT-@XE;UP0)tp)#F#(ilQSQs!hutsu?`mcR$VSa-00DcFO$r^}9_-!AkJmzB+@5j^nwfXLNnyuiq;i=98?2=|j zr|Jf?4GK0U6PkCrH|6d(4?J;Pr>VHOoh@bmlHEw8w03XQsC-?K%IyAL0o;9olk#Nm zHdC4&y{v2X2ZiQwN!0QSambCmKNL^3d3TmiE%dX=l#8tJLy)f)n|8V%_lhrx=OZB z>y@^sD;&>!RpoBm8ilPuZR3hbT&H&>4;^h}Vkn+WsxY6uH%TtxEIxNvM43}mVw5we zKPk#8#@j==1^Zrqrd+55DQi5?;lISG|B!u1`L#4=_YHOK%vWnlWu=zeU#!Z;Z`?KL zBKQbt%fzL6tP6IzYomtG9Sd;Sn{BGRV0Xf^!1KPll47*uPT3r#veO6Z3U-+&my=Np zH!77*;O`1Ozn%B2U2;t+Dc!+dZ|AaPVIJMOM_ay9Q~dKmZgthDh+Gx^EV1wXIJrYS z(i11dOj-gilxJ+M(Bca_eL4QggG>Emueg)$w@ciinH{wi=*^pJ7uwE#PENp52>Igd zlMt;e*V6UR&x;=FZ)}mtL<(|OpoTkI+*~nT3S4Af~Vw~%JOSzsW9pSvL%l^K;-?|KF zjt*S@&XHwKTl(m_pUl-Ao))J5-`{$oX*NDDKN7DhyBD%Yv{E^KtKUA)4;JfcGNE7m zw9Lh>Y#kkLCV@$qDl-qr0Y$Yz{%^UZZr?|t&wWkhPK8TIl zsxPCnvZHp(E&b&CI;*C_iN*DV%n6o;eUi)ly0dqL6KVH$Pn@x9yt)=SVVPfFqhVhgS z16h|@<1AqZizmq@FSq-h7di2V@V7vbZO@2dKdNpgWZ~1d#9q;_U-W5;=7>S9do_+d zPTj)s{h;nO)F{2LtyV>g!OLhmO=My5^)s?hJPobx<}Wej4ZMHt$NmN*$Zr6VC+CH9H(BGHd%bqKo7qpIdcd-XD{)Kf*uR`Es*c;D^rG9(k6U zm>P-FfVkFilvq|`$gK8$?QicmpVuT5w)aR<3JnJL@jbqf=XO6(DNDM8G*`1_J6C?% z(`!Qc9F><8zUx$7`cUR~)=~3i-Sm#G&isK-Hfi{$FmzG)o+}jVhis*=KqB?!LS+AGlwRR*wRClZP+4X`q zBART4-QWDu{wvMrl^aLSEk#aX^@tPwaWkF|5h-tH>SnvHoD{xh9+yvBFgyRAYuBN& z*|6P_NTJoV2W-Ky(>ANA_G!sj%jW#Lamvb;SaR0hVt&&Rj;n0fZKGu_K2C4E`)yrs zUQ2IJsDH}KivnN9hu(OYT`y|up1*ZvV=L#mu7&QsLqBA5`@7#3xW#QVu(eXJ)9`)t zV=&BJE3KN=Slh2MB7Mh0J+bN{-7w0jLorG*JC9drJvMJ{bnVz7Vfn<{yc%_0|JV=# zaeHk}R3l>;VQt*xNG{NL7d;w@BmINJP8(5r8#n?6EH0}Ty`sM;tYwhP zEj9IgMC#3`=3*T?f85zmoVG<%&4s#4?rdA{@1I_kkh5yJEnhXGHZEAvwl=wUcvfM? z*`v&RLe)Md!~1i;;BD=S-HTyGOtsjrGXk>}!XZgc-1P}R3_Fzzo3UML+t+QAxD#Yn zuQFb+CM!r3tbQ8JE-&;fvmaHpIv!$RZSgpsR=Ah{L(>_bLBmDk2M%dT-X-#@0ZBJf z2UwDvOqccROuUDef>Ud{!;Ie?Z`(rbd!9+Is`=z`{aM&8k6FCUWK}>jl_4hFFKa)m znhud=U2`!q`8an^@$T9|Y(%x%#C&*Ig58b#*XGITTwEt3eFp}|E}qyM;Bri*P3;D~ zk#Q{kgVw=p-)CqEYYELjQMm^yDZFj0Zu`DTWt7Exc$%p38CS*oT#RYhZzs=Of=n+9 zh^To?6}z3Qz^rW1WZ0>OU+}`XE2XYb-gTwz>e1(lyz4s} z77jES=FAryG=t zY$oDsOUds}B^ows>U>3N$K6s#?daiWeQ>64J-a0=8}$mwv}4?)!^GlB#u3t%I}cC) z2n;gKkQINo`OS}|%PmYxZ#Zzis?|<6wiv`&*wRR8-6%fhSXAezd!XY? zXPjZDm%5ZYrmVqgEL>9Sq}K-a^|Ux{sV%O%|9m7Z`I_#Lo5T6jdkzX`rKZQaoQfXC zo)5UA>#BQYza*M1!{^n)`RttCe10Y!ZK5%STv=+$$;%o?ZAH)MDsEZ47JC0SyZ5vx zO>!TCwP*WR%nI*k`?TpJWi>T@A7ft9G``Vn51LnyK@xZN=3X#&dSowfNI2=io2y3| zM0RAKcZ+c*TQz^Is#&H8M6!&;Po8HvVZvP#TIXmx^{psmPJ`#IcV*Dgrt^pPMj=_6LfBN=k$w@AWkGtS|S zc|nrVZp`6R34At+_IYM~w` zY7*`~dX`s{ihk|d&(z_sHS;}A|GZpc{8M+oHxnO<6#R4T5vR5@xfDL$`Vl+QAZ{$c zC-<5%&3*R-d4*GBAHQ}Qo-gWKYk3kIfrCYvt(!F%+bUPxO2dD@JZVWG#GKB=!q@6} z?I*TH%dt#N?kh;PicVk8d12?GxNsK#9ZUv78P#VwM->fk=LNht!y2=`t~?v|jK|gP zVVKqMcgYu4{DJYhMlElaTT6FQ8SK(UZdH9Bs1 zIZXjy;9@9sN>Q74ZHQ?>mn&PUyZx#gO;DSrU1Q!%JcG^q*VBsv&u?60SJd@RI7;Po z?3X&yz$lh-FzczL?G^oZJPN|LIo^97ZW}Z=qPj~hvF_WN6}9T%T-DIp+cgmMW_Jvo zgKt|x+_JVgxgl^$?Q#H8cSMiHIM8eCV6WiyoOHo^So*-rgUzL;kBwRzvY0+xx$c@X zvLoc8m)odBaaTZ&_UwlWM1rfvu0VgLLn}WnwrIbledo~sQ1FUbW5I2`(FcS14L;o} zm7jK%wM4YxG+1O=f2DMiI>6Q{%jiHpew5Bkl4m@w+;fJnCVj-C zbw}fBzl^YGfPuJ$o}=SA%aiE?-Ss8+<_0RB^e4Qx7y0VhHhstA z){E4TPGN)NLozH*H$zWNrtUmP-E;dC%@)D0$5+@+ z&rc}|O&_n_qe~96KaA5;&03+SS@8oU^zo^$ie&D-G+N8b)$lKmucsc?2zq1nMQ|fm z)SmKeF8$O!i&MKsCGzGCt~efeY3Dz&BwB2#xa~t#9|zZEDtd7H$!vtZ$wu`|fb-qh z0j1Nyx+kO>cZSnh=4g-HtJoiscRV!RZLui+Wpw3T2d=jd$R}H9oD|sB1}W2Nd7nhu zM^RiWSNC_j@)ke6OH*srQfr^69ryuvA-||WiG1n4=){pd>Pa&C-xEq|6fWMoJTk_Z zd^*4xd0F#fRJ`3lZp6-GejHz;eZvLx)?O{v7rcLSkvEV-zewEbs}(OE!&ez1fhFHg zTPg0A)?eGg)v8C{xsC4Qi3Rn&MH!mJ*MfT=Fz&;lbI2D5;_?@^sV~j%DewqBTW^y+ z=shJ{=k!+M(A)ZL>vWl@g|_j__xD$e`y+ZDpXmq(FSHx~=~6U#*dH8w6=o9vgQ(b;jwW0`+WOqz4f>z*}6 z`e0sm$fqBOff<%p09bHQuHEON4%RTxQ!KtQ^P-6u5u}JdlZ?KN+l5Q6XKma>&_oo4 zLqMG3RKdxOCSt+Y7tS~^9X`w?qatF0CZZ|kWO2$`Iwt~6iH#7YU@|y`(3|%VkvVN- zEJ8qwU~mAN;P4{OmmD3#5vnBqD81|W9;6i3qWqCJ)_$z1YY^N6My|hP6J@^I!%1>`8ojwq6R=I6?X)KA* z6mB5TOi@kFPkY}ydQY|~&4@RjPm#05`PKVE!@MJfI z7X4X)L%|6@eCB6IRO4D|EsI$@Q~SN&gv_sRZPDD*v#f+yJE`^dm4P4e8-?xdVVl7# z#Kpu%FVsG6oAgXeTGN}+oGv@|O(XcB#3=I7iAdAe>tdP}Nhuk+O7q#}-Z#7t-?M3- zjMIJmVzyu-E%9KAwWNW@Jl!jNkF$3y`5M=^z5PZHG}7o#M)2C}2n0mc4%%Hii+d|F z7dCY3-Irr!6oHYWu7z(8M%aG1U>OiYT42JH{CcMk`Qpd-;s?>KZ_m?w5f~ss&10%UATMm`* zUJ*2inPUiKbrwW+pGR_)zsl-(C($dA8azineAd@cspG0_2FS(lbE5E{AKsWL-7#rw zhg*DqW6-;V_HpDX>|-}w{)5dwgw>>s(FulSbiVuoQ8^kqCzUB8USVg(RZbj!(^tSN zxTl$$wwkNVV4KFu-XRO|wfe(bV%?`L&11a0mcJPE9yRQ3=-0|&aXBWsGNWbb+Og-j z5P8h|V&5bhoMt>&wYLT@pPj4ClKH(grX=xfvU*O6CE} zTdf=_8jgq=be$aweE)?RCHu%HE0zUyh3;W)wX75~>9dKTS3-SnxS_p$#-n$glFfN$ zcA4hlb5ozbTW;meiK~14p80I;k@8zH_|u$Z7PQRvmLQR8kCt7%dj#8FRIqpN3~6jg zowyRo`!Hj#dYy>y!&W`tT@uwuCKa!Zn2PJXomPJQ5<}%7TfgrO7h}G2LN-3vG%1rS zyc_vRq*k6s4dJ_^XQdVK0US`Q@VKL`N`K0f~AM`!~#v#93Dr#*|LUI7us@izI9$KV>>VXe(Q|0F1l~M zCgm2^v+oR?2)4XlaHh>zpWAFP{zZp$7kkGW_d$-i@HKqeM}H&r^6$t4XY)-F^h=_g z+0+7ZE%OOAu`5%V9PtfxTJG0xi6dIn%ZPQ`$;uZJS%;o)*ZnM8^n|COnIU)NNkbSL zMXG(yP{jX&k^P}vZ+Je5o%{r47d)eVoek z)@{lnS0Bn9-k~tm*z4Ja_nx-r9rlYv)OEh4Klt(JZh^FYOdsmP*}WvcMBXlX_t6M@ zK;J8~hicexz34&(OUBxp)43HF?#arp`&8H8X#*to?G+|RKEL6 zTp+bcn1)l2)3-vl!TX`V!%$$>*_^ZXG&>{RYz~u|=j~ISVtm#1E0`Ya{NljmUMneE zKprk+kD9-^?`lAoL&u5h^g*h^;e*>SmRhlNE*Un-uhFdA?Nwd{A_>pJCkzbqN@F?i z)OYu>IJae<968>7nC9w(g^~Wl$K>?3e{B75t!8+mKC5g<#zZidC2E&x;QhG(7xrcH z*sTTGcCyRSqf||8z93`ggDQ@nIyD{oW_!YtZuX_2^2I)X?EY-xHG#Z`z?h#j$6;@d|mgL2$R4ztNI1`<@e?R+O2-ir~>}|tLv6?A71Rc z$7`~!Nx5h1vKM*D!`jb7kLs#OOsQ{_)Bf;1m@kZclS4#FJVlt}@Z}VL;}?u2KDK+V zs+Yf45Ik79T%I?qZ8^;KRM5>cesqW{ND{p#PcXx(s5E4Tl6XDS$4G+COnrxil%3y3=1Gyjht|&#vd3NOmwxF0?XL*} z8MQv8^y#GpMrj%G<0b_HUOUdN)1Nb2clA~~_*JQUcKTZMQNQJs&Qvbns)i|{6UkAg zOHHSbB@Rn%DdbD~N9Y6X>di@q%NK$97lcRXo4D#iWPSRqJ{P$Dmo79Rv z55+#cw*SaM!5=*jkaZ4=?s8>zBJ|EV`reW9yJ$~Q3(2puH=9b|`rqDuC3jeE_Ql~CpI)=`$Soy(_ELu}2h#3c(Dvv(c z!`t*2rQp@SYmjGS?#9~12Gmk7*ZToX(xFOLxtN`|1#e2u)cBf+NSvCWUqyAU@LKq1 zsnYP=RSSIW6Fc^O>2`W{e|ZvtOcU{RC&wn(qa~rK)!GOVUNi}g^GLsNo_`bPJ~R>k z6PlrkgnvGX|9p~ueUgxypA_T7omA;=T1HCsexeWwDUBf!MetaHG!BmyK_M~HXc9>T zj|0dKji+2r*QFGw$O~gpC}|`HBZ5ccrIBci2o{ZzCSkB5cnnsWNW@dV+*hQ0DAc0( z6>jCjBeBw007-Euf;5H*?v27oW3V`Iuicc2LQ%@KA}wJI9<0HlM6e{3G#U-yCIPI) zf;~tu9V24F+C5bH76vwoR}m|ML=ioq^{=EDB2JpLi8=p~6hi_Mpf-2xrf?KV7Hc8J}4;E$gg`WO77F$8IFe@aa;m)NFG z|HRIar6?jw8oxQhqt2=#*m@C%_InQQ-`Ea6Si*cHht@TUMoZAZ< ztNzP(KhJo)(aBvD;}km*LnA~pQo4TN&ib5m*X&wzd0~}>Vd?HFi?OLQkKR|rw-}B% z-YlG*XDanrJh2$yxP<@E%=Zn=964cHRaLdtIx0M9LN@)nj+Oa(xb;JC-p18+58TW<5TH80oB2`cu?GeB zqx4?RR2h1bzt0ttn?#&s#E!9kTYhsc~#fZRHDH2-NjtGgu_6zj#pl<#U9{g9<`qe`No$ zuKLl=d$WW2GSanO-P#7WYTAeQFVKW|trKHBqK5?!4+wa4x1z&?kyjf`@;KAin>|Fm z*X#1{&G2=U+!%b49OumZnq4{HM6bpsyrf0`aa)9_He>$eIgVvVEhVk3IR=eOkJ!9U zkmbgC^LVOy$Y}wM$;A6SzJtiOmvl=O8ac+&mFesDUP?Hppk}i+H*sfJ=G!4z;#4Gc z`6i$5Y3m1%@=MfiPgDmy$$#nCS=wE*653hTX%coMQ^l7%nC*kR>n_=a?`#K5nkx3) zxpuEa+G;$&g++Y$?(H0A{j>c3%J(D3YhUXf7OxMD4i4lcbMSwDud-rrB(|Zo+;cqw#zT(Nl7Dpcm4;i zW!gNgh^*uE&&5xH-#6iW}hPFtXx;oL^_iFambi8ay@dym>1rjxHp z?z!CtADa5I4+|3`2Chc8&&H?(1<5mf=1+Tl)d`)#^C0^3_tV?-&DmA>pX^fsnqBcT3z=K3!v1dT+^sy#Lo8?swHR7IZdP-Q$pde z3xfSXiatVRG*pQ^b%UC~t)H9Qc|cKnTVlZ^`)#rFyJ#4PuD);)tx%NgKpx6CqE#e3 zM!f!FtBqco(#Y;znpa|5t z-+uC3-dJIQPD#vM!K*Gq>4yX!^;2Q@bnJUDit+YO*eLHA7>9?4yQaUQ8B(%xgNS)b zq@lCteGFLnXCLK|=L=jj=Gff}8OME;h&K+IdtCBpU9vd7Cg#E-*?(#B>7ekytEj~s zg8J!%B~t~QYeCu>8y=UC*Lg`paen*E}S@h^K4Z z(LH6{b>rfwB2$cx>NC5TgljZD>^y^yC5>J2jB`TnIfTAhCURKyzC}5gmpIWHL*E9L z%n-L4_0w6nR@L$+TGLsED|Jn172g7n&-p*NaP$O;v0G2`A7nB%XNWtsd+}yo5Usk~ z5~Q&ZtzQ592EAc*kYW9DL3pF5?pw{b(L2pYZJED%d`-Vv?;?8N!4bFKF7$RIDDJao zz+2OTZJe)t z6BljvPQO&wu27b5{hG@j?t<4=(L55}D*Gx!c|L9(`=PLUH1ieJ&-rHIJ>wWZ9hH@A z+wYoL1c6&GU(9Fac^+N(cbj(H=Kqf*DK$V(M{k^!DIrJMv%>1N4vWl@hxgyrxUbu^YKZJ{ zb1#U9dfINnr0q{nN*SW+DT^OK)^6^uHdaoQ zq6%KBju?XR-zgvq4{~$L_ty{*gGB!`1mvbjRdP_w$a^VgD!ITk&fHRrl2pmb^Ak`0 zp84UiBxxcBL#eIY1NjDv!%5>&1d1NmjRr7=moja|S1MaodX)}?M3#L~MWpVgY_DRW z9&|u(QPq?X{M46r2wAF!Jwk*kW{)@ymZ7Lc_6Q-Wq%va1wfpu6@JkDR>A)|2*?oJ4 z_){FeK-j+!3WLOyovLAY%uJ2#WZiU`f=>aRw3} z76mZs=8uT82-D^#0MmFpiu!Gw;Set#^a7hde|(1{V5q7S;5!uP3n1TNi8$)b2?ioR zScHOoiy;xHBNKonVRPaP*@^+u;wCrcA;Ec~(I{%j=9f4ed?yNvr*=#-q>!-$=$Cjr z5p*Sgv%&+}a8Mcw4buW1i$_8=gC~$ku=}Ag*q=1^Kh=cC<4I+R&kSD>WE=^i3M39l z1)8frH2`P?Bt)!D8XkBxWE~Nzc(9JN*_{2oj)cViRHWE{Vu6L=j?jff5(ZOtbB3XY zo(#Gc=(i*k4q|8UjsY446P1JpV}Ga!7&Lq@X0y+Ph>8Wh8z7PY6qN*;Imki+5(ApY zzc&LK>_`M87BrjCby%2=z&QwiIve1RL;^Elp%N01c$j8D7{d%pK%r0&{{USgiU4&0 z0t$_WIsl-NiBPo?(MUXWGZ77E0%$NMM385oOaSeF@W5bynU4HB&XGhk2K4cNtB{Ds zf=4<~8V&_jH4%*?z)gq8!)b)Sqi$3G1SA0(#()O0BZM)a!5oQzB>i%vKm3S*0yl;3 zMImv2+I{m#M3A=0|AV;s^lS6y-wX&A62RmEMgvn2D2<4No0EisMhOw5@P9PD`#&b2 z_`+0;*-Y(U78$JQP-qO*V2Q!vAf7}bL6~3&SfKyEg#qP)NI+AEmKd(nqevJM)oFRN znh@~Rie-jNd`M{K!4PmbB$leV!eA+dC%{wyh9YC>bn(&y}Brv{V*gn%zl8j zISbkR`F&~(C{$2&W2t(Kj9g?aiU89vhJ?pKwT?xRP*8JY(MSSBNk}XhF+u$n3o;Ij zJs3j)+Rx1JTTUzv14|JAuce#k#7GZKp< zVqlv=_J_I(7PmR$`gilMy&&14p_(C~kh^2 z$^g(l%&V}(&5_>ULgUcjWj8?E)czIWB*|C^XOnJ8meg=0aRu<@#lm4%}xJl zhJc0Q9Z>T@a)YQ9AXK;pNjUgHPz2;plYsO8W`ZR`(l(F)N5uYBNjIg!5kZ(h7~|0J zC;^BVE(|D1e>&k${o}CzK$<^xBoN^Wcg>^AC(!jS@0VI9YP%m;9QvZ zgr38jAoK8d7qQz>nd}N#IEU^pGSXEa?-l z7%3xJRYhb0w}RitKu;zSXsbhaIn$? znuDKt=|2I1hvIPnYd{#|aX45~14sy##esM*{{)2sRx0q|Jz$v71R{w*hB79iV3`poCha(ek7+7%xHTi$o9Se_R0vd)_z!U;@VgeDsZ-~$Y0JDKGKlT4x z{RH5wFsVscSU7=x9t}MS$k#9@BqHG`n1}+ClHbDogU~?K!5oQ*M4FCE9kqBo@LctOU0FW>kNCK_^2{Gj6NCC>2g#1-( zH}(Hp{Uj6yW_J=Ao@j_zF!%bc!hcQzh6Yd?2?a-JfcED>e#IXsC9oD192k}th+q-| zWkLkmBZ6vyNFbwOEdh}L1`*KHfrrh|{7nSXK!pJv6Kq681Y;g3`rph^ zKg|Tr|6Bb;5*B86un;y&B9cJY3lWe65E_gLsFYA=1?}FS>PPO_OeG`~ynK?Vsb3km z$eVK{2ruwY!^r<3Cjr_mY}Q{`5RfpiJ`>yzj7Fg60r?P|=kN4D0`LN28NdV&cka!` z8FoVu<4_u?JP_9b_XF<%{9gA@dI0GVHaa5#yb3J=Bpm3{e{cS$fx~0rQ3^^m?8G1w zLxe$+$OID1{3IgimZ3~Q!hz6Gpc8@uc|Zf`{_njgfOMeU2cZ2D=Fjwi+60o269XD7 zazXb7OPqiPupxvo0K`zxjv@ir{)fN)v_F`;!-4?xl1ONAMB|VEy#CDugasN}QqbTa z(4Gm zyu;v$D3})TAPGQ)0oH_tBA5Y^|B_~t2>}g?6ofI*7Brl|I1S8-pzA=F4%-WQewZ*| zn)yqs|21$JfYzZiSPTKAM~K4#8W!5<0U9ViP+>?UXxM?C6THIz=Q^N&Km>sCPvTD+ zfIv_h3XHp9G?36>GyvgYG$OQ(#em^7mJC%57%&rHHw4iHyCLvaI1Lt_V1xr+{DKOD z0spJ;i}t%c1Pj636SnXVB>m4*u+0e-j4^P2m}bEA4w4DM&ds;cfS3I)%4DE^EDSvX z8Vq>>8t~V@HgE0)#)H!!Og7h%{%j}QU9IdLZCt^BZcroH7!O*4nyIRU#^97N;GvHS z77H#wm@29$ssX?NM3xsh{QoX76Oor^a&xzGb@y_$v1I};)Pcxk5*Jt1Rb%=;+e3g< diff --git a/docs/papers/fensalir-pipeline.tex b/docs/papers/fensalir-pipeline.tex index 449abb8..1fe5588 100644 --- a/docs/papers/fensalir-pipeline.tex +++ b/docs/papers/fensalir-pipeline.tex @@ -547,10 +547,15 @@ metadata, control, guide, motion, domain sample, domain support, proposal, and stats. The domain sample lane stores selected pixel/sample UV plus packed producer coordinates; the domain support lane stores support footprint, domain kind, and shift kind. TubeField proposals write selected subpixel UV, -physical rolling column, curve coordinate, tube support, and explicit motion -when available. SDF proposals reconstruct object-local hit coordinates and -mark object-motion replay. Temporal and spatial reuse now reject missing -domain state and include support overlap in the validation weight. +logical source column, curve coordinate, tube support, and explicit motion when +available. Field id still carries physical rolling-column identity. SDF +proposals reconstruct object-local hit coordinates and mark object-motion +replay. Temporal and spatial reuse now reject missing domain state and include +support overlap in the validation weight. The first TubeField replay path +also re-evaluates the shifted selected logical column/curve coordinate against +the live TubeField buffer when exactly one replay batch is bound. Multi-batch +TubeField replay remains invalid until a producer-keyed replay manifest maps +selected samples to the correct source buffer and constants. \section{Reconstruction and Denoising} @@ -642,11 +647,12 @@ validated reservoirs. Neither mode lets a pixel row become truth. \end{itemize} The known architectural gap has moved forward: the current row ABI now carries -domain/sample-coordinate authority, but temporal reuse still needs full -producer re-evaluation after support overlap rather than treating overlap as -the whole legal shift story. The system has cut the false -``nearest-travel-minus-coverage'' priority owner and the side-cache temptation; -the next proof cut is producer-domain replay with measured rejection precision. +domain/sample-coordinate authority, and the first TubeField replay path +re-evaluates a selected logical column/curve coordinate in the current frame for +the single-batch proof case. The next proof cuts are SDF object-hit replay, +producer-keyed multi-batch replay manifests, and measured rejection precision. +The system has cut the false ``nearest-travel-minus-coverage'' priority owner +and the side-cache temptation. \section{Evaluation Plan} diff --git a/docs/perfect-fensalir-machine-roadmap.md b/docs/perfect-fensalir-machine-roadmap.md index 793e5d2..cd8d2dd 100644 --- a/docs/perfect-fensalir-machine-roadmap.md +++ b/docs/perfect-fensalir-machine-roadmap.md @@ -45,9 +45,11 @@ Fensalir already has the first shared GPU field-reservoir spine: The surviving flaw has moved one layer downstream: the live ABI now stores selected sample UV, packed producer coordinate, support footprint, domain kind, -and shift kind, and temporal/spatial validation uses support overlap. It still -needs producer-domain replay/re-evaluation before reuse can claim the full Area -ReSTIR proof rather than a first legal-overlap gate. +and shift kind, and temporal/spatial validation uses support overlap. TubeField +history can now re-evaluate a shifted selected logical column/curve coordinate +against the live producer buffer when exactly one TubeField replay batch is +bound. Multi-batch replay still needs a producer-keyed replay manifest before it +can claim authority. ## Invariants @@ -476,9 +478,12 @@ Work packet: and shift kind. 5. Done: implement temporal/spatial support-overlap validation before further threshold tuning. -6. Next: implement producer re-evaluation after the support-overlap gate for - TubeField rolling-column replay and SDF object-hit replay. -7. Capture the occluded-spectrum-tubes scene in baseline and native-domain +6. Partial: implement producer re-evaluation after the support-overlap gate for + TubeField rolling-column replay. The first path is intentionally limited to + one replay-bound TubeField batch; multi-batch replay is rejected until a + producer-keyed replay manifest exists. +7. Next: implement SDF object-hit replay/re-evaluation. +8. Capture the occluded-spectrum-tubes scene in baseline and native-domain modes. Required verification: diff --git a/src/Aquarium.Engine/Render/D3D12Renderer.cs b/src/Aquarium.Engine/Render/D3D12Renderer.cs index 36c18b3..eabd7a7 100644 --- a/src/Aquarium.Engine/Render/D3D12Renderer.cs +++ b/src/Aquarium.Engine/Render/D3D12Renderer.cs @@ -83,6 +83,8 @@ public sealed class D3D12Renderer : IAquariumRenderer private const int RootBlueNoise = 18; private const int RootFieldReservoirCandidates = 19; private const int RootReservoirResolvedOutput = 20; + private const int RootTubeFieldReplayConstants = 21; + private const int RootTubeFieldReplaySource = 22; private const int RootFusionFrameConstants = 0; private const int RootFusionSeeds = 1; private const int RootFusionSensorCameras = 2; @@ -2574,6 +2576,14 @@ public sealed class D3D12Renderer : IAquariumRenderer historyReadBuffer.Transition(activeCommandList, ResourceStates.PixelShaderResource | ResourceStates.NonPixelShaderResource); historyWriteBuffer.Transition(activeCommandList, ResourceStates.UnorderedAccess); reservoirResolvedRenderTarget.Transition(activeCommandList, ResourceStates.UnorderedAccess); + var tubeFieldReplayBatch = tubeFieldDrawBatches.Count == 1 ? tubeFieldDrawBatches[0] : (D3D12TubeFieldDrawBatch?)null; + var tubeFieldReplayConstants = tubeFieldReplayBatch is not null + ? tubeFieldReplayBatch.Value.ConstantsGpuVirtualAddress + : frameResources.UploadRing.WriteConstant(D3D12TubeFieldConstants.Disabled).GpuVirtualAddress; + var tubeFieldReplaySource = tubeFieldReplayBatch is not null + ? tubeFieldReplayBatch.Value.Source + : tubeFieldStatsBuffer; + tubeFieldReplaySource.Transition(activeCommandList, ResourceStates.PixelShaderResource | ResourceStates.NonPixelShaderResource); activeCommandList.SetDescriptorHeaps(frameResources.TransientShaderDescriptors.Heap); activeCommandList.SetPipelineState(reservoirHistoryUpdatePipelineState); @@ -2587,6 +2597,8 @@ public sealed class D3D12Renderer : IAquariumRenderer activeCommandList.SetComputeRootDescriptorTable(RootCurrentReservoirGuide, frameResources.SceneReservoirGuideDescriptor.Gpu); activeCommandList.SetComputeRootShaderResourceView(RootFieldReservoirCandidates, fieldReservoirCandidateBuffer.Resource.GPUVirtualAddress); activeCommandList.SetComputeRootDescriptorTable(RootReservoirResolvedOutput, frameResources.ReservoirResolvedUnorderedAccessDescriptor.Gpu); + activeCommandList.SetComputeRootConstantBufferView(RootTubeFieldReplayConstants, tubeFieldReplayConstants); + activeCommandList.SetComputeRootShaderResourceView(RootTubeFieldReplaySource, tubeFieldReplaySource.Resource.GPUVirtualAddress); activeCommandList.Dispatch((uint)((width + 7) / 8), (uint)((height + 7) / 8), 1); activeCommandList.ResourceBarrier(ResourceBarrier.BarrierUnorderedAccessView(historyWriteBuffer.Resource)); activeCommandList.ResourceBarrier(ResourceBarrier.BarrierUnorderedAccessView(reservoirResolvedRenderTarget.Resource)); @@ -4392,6 +4404,8 @@ public sealed class D3D12Renderer : IAquariumRenderer new RootParameter(new RootDescriptorTable([blueNoiseRange]), ShaderVisibility.Pixel), new RootParameter(RootParameterType.ShaderResourceView, new RootDescriptor(45, 0), ShaderVisibility.All), new RootParameter(new RootDescriptorTable([reservoirResolvedOutputRange]), ShaderVisibility.All), + new RootParameter(RootParameterType.ConstantBufferView, new RootDescriptor(3, 0), ShaderVisibility.All), + new RootParameter(RootParameterType.ShaderResourceView, new RootDescriptor(42, 0), ShaderVisibility.All), }; var staticSamplers = new[] { @@ -5130,7 +5144,22 @@ public sealed class D3D12Renderer : IAquariumRenderer Vector3 AxisStep, float Padding1, Vector3 ColumnStep, - float Padding2); + float Padding2) + { + public static readonly D3D12TubeFieldConstants Disabled = new( + Vector4.Zero, + Vector4.Zero, + Vector4.Zero, + Vector4.Zero, + Vector4.Zero, + Vector4.Zero, + Vector3.Zero, + 0.0f, + Vector3.Zero, + 0.0f, + Vector3.Zero, + 0.0f); + } private sealed record D3D12ShaderPaths( string HeightField, diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl index 57c940d..f0d02df 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl @@ -27,6 +27,22 @@ cbuffer AquariumFrame : register(b0) float4 cameraFrustumZ; }; +cbuffer TubeFieldReplayConstants : register(b3) +{ + float4 tubeShape; + float4 tubeColumns; + float4 tubeAmplitude; + float4 tubeMaterial; + float4 tubeDispatch; + float4 tubeDraw; + float3 tubeOrigin; + float tubePadding0; + float3 tubeAxisStep; + float tubePadding1; + float3 tubeColumnStep; + float tubePadding2; +}; + Texture2D sourceTexture : register(t0); Texture2D currentSceneMetadataTexture : register(t5); Texture2D currentSceneControlTexture : register(t7); @@ -40,6 +56,7 @@ Texture2D bloomTexture6 : register(t35); Texture2D bloomTexture7 : register(t36); Texture2D currentReservoirGuideTexture : register(t26); Texture2D blueNoiseTexture : register(t28); +ByteAddressBuffer tubeFieldReplaySamples : register(t42); SamplerState sourceSampler : register(s0); #include "D3D12Aces2.hlsl" @@ -165,6 +182,114 @@ float3 temporalPreviousWorldPosition(float3 worldPosition, float fieldId) return worldPosition; } +uint tubeReplayPositiveModulo(int value, uint modulo) +{ + int m = (int)max(modulo, 1u); + int r = value % m; + return (uint)(r < 0 ? r + m : r); +} + +uint tubeReplaySampleAddressWithOffset(uint logicalColumn, uint sampleIndex, int rollingOffset) +{ + uint width = max((uint)round(tubeShape.x), 1u); + uint height = max((uint)round(tubeShape.y), 1u); + uint firstColumn = (uint)max(round(tubeShape.w), 0.0); + uint columnStride = max((uint)round(tubeColumns.y), 1u); + uint rollingModulo = (uint)max(round(tubeColumns.z), 0.0); + uint physicalColumn = firstColumn + logicalColumn * columnStride; + if (rollingModulo > 0u) + { + physicalColumn = tubeReplayPositiveModulo((int)physicalColumn + rollingOffset, rollingModulo); + } + + physicalColumn = min(physicalColumn, height - 1u); + uint strideBytes = max((uint)round(tubeShape.z), 4u); + return (physicalColumn * width + min(sampleIndex, width - 1u)) * strideBytes; +} + +float tubeReplayRawSampleWithOffset(uint logicalColumn, int sampleIndex, int rollingOffset) +{ + uint width = max((uint)round(tubeShape.x), 1u); + uint clamped = (uint)clamp(sampleIndex, 0, (int)width - 1); + return asfloat(tubeFieldReplaySamples.Load(tubeReplaySampleAddressWithOffset(logicalColumn, clamped, rollingOffset))); +} + +float tubeReplayFilteredSampleWithOffset(uint logicalColumn, float x, int rollingOffset) +{ + int center = (int)floor(x + 0.5); + float s0 = tubeReplayRawSampleWithOffset(logicalColumn, center - 2, rollingOffset); + float s1 = tubeReplayRawSampleWithOffset(logicalColumn, center - 1, rollingOffset); + float s2 = tubeReplayRawSampleWithOffset(logicalColumn, center, rollingOffset); + float s3 = tubeReplayRawSampleWithOffset(logicalColumn, center + 1, rollingOffset); + float s4 = tubeReplayRawSampleWithOffset(logicalColumn, center + 2, rollingOffset); + return (s0 + s4 + 4.0 * (s1 + s3) + 6.0 * s2) / 16.0; +} + +float tubeReplayCatmull(float p0, float p1, float p2, float p3, float t) +{ + float t2 = t * t; + float t3 = t2 * t; + return 0.5 * ((2.0 * p1) + + (-p0 + p2) * t + + (2.0 * p0 - 5.0 * p1 + 4.0 * p2 - p3) * t2 + + (-p0 + 3.0 * p1 - 3.0 * p2 + p3) * t3); +} + +float tubeReplayNormalizedSampleWithOffset(uint logicalColumn, float x, int rollingOffset) +{ + float value = tubeReplayFilteredSampleWithOffset(logicalColumn, x, rollingOffset); + return saturate((value - tubeAmplitude.z) / max(tubeAmplitude.w - tubeAmplitude.z, 0.0001)); +} + +float tubeReplaySampleCurve(uint logicalColumn, float x) +{ + int i1 = (int)floor(x); + float t = frac(x); + float p0 = tubeReplayNormalizedSampleWithOffset(logicalColumn, (float)(i1 - 1), (int)round(tubeColumns.w)); + float p1 = tubeReplayNormalizedSampleWithOffset(logicalColumn, (float)i1, (int)round(tubeColumns.w)); + float p2 = tubeReplayNormalizedSampleWithOffset(logicalColumn, (float)(i1 + 1), (int)round(tubeColumns.w)); + float p3 = tubeReplayNormalizedSampleWithOffset(logicalColumn, (float)(i1 + 2), (int)round(tubeColumns.w)); + return saturate(tubeReplayCatmull(p0, p1, p2, p3, t)); +} + +bool tubeFieldReplayAvailableFor(FieldReservoirSample sample) +{ + return tubeShape.x > 0.5 && + sample.domainSupport.z > FieldDomainKindTube - 0.25 && + sample.domainSupport.z < FieldDomainKindTube + 0.25 && + sample.metadata.x >= tubeDraw.z && + sample.metadata.x < tubeDraw.z + 50.0; +} + +float tubeFieldReplayValidationWeight(FieldReservoirSample currentSample, FieldReservoirSample previousSample, uint2 pixel) +{ + if (!tubeFieldReplayAvailableFor(currentSample) || !tubeFieldReplayAvailableFor(previousSample)) + { + return 0.0; + } + + uint columnCount = max((uint)round(tubeColumns.x), 1u); + uint logicalColumn = min((uint)max(round(previousSample.domainSample.z), 0.0), columnCount - 1u); + float sampleX = clamp(previousSample.domainSample.w, 0.0, max(tubeShape.x - 1.0, 0.0)); + float value = tubeReplaySampleCurve(logicalColumn, sampleX); + float amplitude = pow(value, max(tubeAmplitude.x, 0.0001)); + float3 replayWorld = tubeOrigin + tubeAxisStep * sampleX + tubeColumnStep * (float)logicalColumn + float3(0.0, amplitude * tubeAmplitude.y, 0.0); + float3 ray = rayDirectionForPixel((float2)pixel, jitterPixels, cameraPosition, cameraTarget); + float3 delta = replayWorld - cameraPosition; + float replayTravel = dot(delta, ray); + if (replayTravel <= 0.0 || replayTravel > farDistance) + { + return 0.0; + } + + float rayDistance = length(delta - ray * replayTravel); + float radius = max(tubeMaterial.x + value * tubeMaterial.y, 0.0001); + float support = 1.0 - smoothstep(radius, radius + max(radius * 0.35, 0.01), rayDistance); + float travelTolerance = max(0.045, currentSample.colorTravel.w * 0.018); + float travelWeight = 1.0 - smoothstep(travelTolerance, travelTolerance * 4.0, abs(replayTravel - currentSample.colorTravel.w)); + return support * travelWeight; +} + float2 projectWorldToPreviousHistoryUv(float3 worldPosition) { float3 forward; @@ -484,7 +609,10 @@ float reservoirTemporalValidationWeight( float confidenceWeight = lerp(0.45, 1.0, min(reservoirSampleConfidence(currentSample), reservoirSampleConfidence(previousSample))); float domainWeight = reservoirSampleDomainValidity(currentSample) * reservoirSampleDomainValidity(previousSample); float supportOverlap = fieldReservoirDomainSupportOverlap(currentSample, previousSample, dimensions); - return travelWeight * fieldWeight * normalWeight * colorWeight * coverageWeight * coverageContinuityWeight * detailWeight * confidenceWeight * domainWeight * supportOverlap; + float replayWeight = fieldReservoirSampleRequiresExplicitMotion(currentSample) + ? tubeFieldReplayValidationWeight(currentSample, previousSample, (uint2)pixelFromUv(currentSample.domainSample.xy)) + : 1.0; + return travelWeight * fieldWeight * normalWeight * colorWeight * coverageWeight * coverageContinuityWeight * detailWeight * confidenceWeight * domainWeight * supportOverlap * replayWeight; } float reservoirTemporalRejectionCode( @@ -524,6 +652,12 @@ float reservoirTemporalRejectionCode( return 8.0; } + if (fieldReservoirSampleRequiresExplicitMotion(currentSample) && + tubeFieldReplayValidationWeight(currentSample, previousSample, (uint2)pixelFromUv(currentSample.domainSample.xy)) <= 0.0) + { + return 9.0; + } + return 1.0; } @@ -713,10 +847,22 @@ float4 reservoirDebugOrColor(FieldReservoirSample candidate) { color = float3(0.0, 1.0, 1.0); } - else + else if (invalidation < 6.5) { color = float3(0.9, 0.0, 1.0); } + else if (invalidation < 7.5) + { + color = float3(1.0, 0.35, 0.0); + } + else if (invalidation < 8.5) + { + color = float3(0.5, 0.15, 1.0); + } + else + { + color = float3(1.0, 0.0, 0.25); + } return float4(color, candidate.colorTravel.w); } diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12TubeField.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12TubeField.hlsl index 4c097be..7807e11 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12TubeField.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12TubeField.hlsl @@ -879,7 +879,7 @@ SceneOut D3D12TubeFieldPS(TubeFieldVertexOut input) output.reservoirGuide = float4(claimCoverage, 0.0, supportCoverage, value); output.depth = saturate(travel / max(farDistance, 0.0001)); float target = fieldReservoirDefaultTarget(output.colorTravel, output.control, output.reservoirGuide); - float selectedColumn = (float)PhysicalColumnWithOffset((uint)round(input.tubeData.x), currentRollingOffset); + float selectedColumn = round(input.tubeData.x); float2 selectedUv = (baseSamplePx + 0.5) / max(resolution, float2(1.0, 1.0)); float2 selectedProducerCoord = float2(selectedColumn, sampleX); float2 supportFootprintPx = max(float2(baseRadiusPx, baseRadiusPx), float2(0.5, 0.5)); diff --git a/state/evidence.jsonl b/state/evidence.jsonl index c389bce..433e144 100644 --- a/state/evidence.jsonl +++ b/state/evidence.jsonl @@ -293,3 +293,4 @@ {"timestamp":"2026-05-29T21:10:00+01:00","topic":"siggraph-core-paper-reorientation","lesson":"SIGGRAPH framing should not sell the whole Perfect Machine as one paper. The focused technical claim is native-domain reservoir state for mixed TubeField/SDF/splat reuse: selected producer-domain coordinate, support footprint, proposal measure, target value, and legal shift metadata should reduce leakage/ghosting compared with texel-owned reuse. The broad pipeline paper remains architecture context; the focused paper names required scenes, baselines, ablations, metrics, and current prototype debug captures, and explicitly does not claim final results until those proof obligations are paid.","files":["docs/papers/fensalir-native-domain-reservoirs.tex","docs/papers/fensalir-native-domain-reservoirs.pdf","docs/README.md"],"sources":["user SIGGRAPH-hat review","docs/papers/fensalir-pipeline.tex","docs/fractal-domain-reservoir.md","docs/temporal-spatial-evidence-reservoir.md"]} {"timestamp":"2026-05-29T21:35:00+01:00","topic":"perfect-fensalir-machine-roadmap","lesson":"The Perfect Fensalir Machine roadmap now makes the native-domain reservoir proof the first implementation gate. The immediate work packet is to add or repack FieldReservoirSample so TubeField and SDF row-0 proposals carry selected domain/sample coordinates and support, expose support/shift debug views, and validate temporal reuse by support overlap before more occlusion-threshold tuning. Broader fractal hierarchy, residency, sensor/flow, and learned-priority work waits behind the evaluated mixed-field proof.","files":["docs/perfect-fensalir-machine-roadmap.md","docs/README.md","state/scratch.md","state/map.yaml"],"sources":["docs/fractal-domain-reservoir.md","docs/papers/fensalir-native-domain-reservoirs.tex","docs/reservoir-reconstruction-action-plan.md","user requested synthesis into implementation roadmap"]} {"timestamp":"2026-05-29T22:23:11+01:00","topic":"native-domain-reservoir-abi","lesson":"FieldReservoirSample is now a nine-lane native-domain reservoir row: colorTravel, metadata, control, guide, motion, domainSample, domainSupport, proposal, and stats. TubeField proposals write selected subpixel UV, physical rolling column, curve coordinate, tube support footprint, and shift kind; SDF proposals reconstruct object-local hit coordinates. Reservoir validity rejects missing domain state, temporal/spatial reuse includes support overlap, and debug modes 16-18 expose domain coordinate, support/domain kind, and shift state. The next proof cut is producer re-evaluation after support overlap, not another occlusion threshold.","files":["src/Aquarium.Engine/Render/Shaders/D3D12FieldReservoir.hlsli","src/Aquarium.Engine/Render/Shaders/D3D12TubeField.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl","src/Aquarium.Engine/Render/D3D12Renderer.cs","src/Aquarium.Engine.Contracts/GraphicsSettings.cs","tests/Aquarium.Engine.Tests/FieldReservoirAbiTests.cs","docs/papers/fensalir-native-domain-reservoirs.tex","docs/papers/fensalir-pipeline.tex","docs/perfect-fensalir-machine-roadmap.md","state/map.yaml","state/scratch.md"],"sources":["docs/perfect-fensalir-machine-roadmap.md"]} +{"timestamp":"2026-05-29T22:42:00+01:00","topic":"tubefield-single-batch-replay","lesson":"TubeField native-domain replay now uses logical source column plus curve coordinate as the selected producer coordinate while field id retains physical rolling-column identity. The reservoir history compute pass receives a TubeField replay source/constants binding only when exactly one TubeField batch exists, then re-evaluates the shifted selected sample against the live producer buffer before temporal merge. Multi-batch TubeField replay is intentionally invalid until a producer-keyed replay manifest maps selected samples to source buffers and constants; do not fill that gap with a side cache.","files":["src/Aquarium.Engine/Render/Shaders/D3D12TubeField.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl","src/Aquarium.Engine/Render/D3D12Renderer.cs","docs/perfect-fensalir-machine-roadmap.md","docs/papers/fensalir-native-domain-reservoirs.tex","docs/papers/fensalir-pipeline.tex","state/map.yaml","state/scratch.md"],"sources":["docs/perfect-fensalir-machine-roadmap.md"]} diff --git a/state/map.yaml b/state/map.yaml index 3b7172d..154d3a9 100644 --- a/state/map.yaml +++ b/state/map.yaml @@ -128,11 +128,13 @@ next_actions: residency, and learned-priority work waits behind that gate. - Cut the rendering rebuild through explicit field-domain/field-claim contracts before adding another backend-specific visual path. - - Before more occlusion-threshold tuning, extend the first native-domain ABI - cut into producer replay/re-evaluation. TubeField and SDF proposals now - include selected domain/sample-coordinate and support data, and reuse - validates support overlap; the next cut is to re-evaluate the shifted - TubeField/SDF sample in the target domain before merge. + - Before more occlusion-threshold tuning, extend native-domain replay beyond + the first TubeField proof path. TubeField and SDF proposals now include + selected domain/sample-coordinate and support data, reuse validates support + overlap, and single-batch TubeField history re-evaluates the shifted logical + column/curve coordinate against the live producer buffer. The next cuts are + SDF replay and a producer-keyed replay manifest for multi-batch TubeField + reuse. - Build the planetary flow organ in staged cuts: provenance manifest, static relief and reanalysis cube-sphere bake pipeline, stochastic advection contracts, synthetic runtime slice, ERA5/OSCAR baseline learning, then @@ -276,15 +278,19 @@ next_actions: TubeField now writes a one-sample reservoir proposal into row 0 with target derived from projected coverage, guide confidence, and luminance relevance; sourcePdf is 1.0 for deterministic structural proposals. TubeField row-0 - proposals also write selected subpixel UV, physical rolling column, curve + proposals also write selected subpixel UV, logical source column, curve coordinate, tube support footprint, and explicit motion shift kind when - available; SDF scene proposals reconstruct object-local hit coordinates and - mark object-motion replay. The old nearest-travel-minus-coverage priority + available; field id still carries physical rolling-column identity. SDF + scene proposals reconstruct object-local hit coordinates and mark + object-motion replay. The old nearest-travel-minus-coverage priority authority is cut from both TubeField injection and final resolve. Shared temporal reuse validates only the previous frame's row-3 final reservoir by field id, travel, normal, domain validity, motion/previous UV, guide - confidence, and support overlap before RIS merge; rejected history cannot - become visible fallback by itself. Spatial reuse validates neighboring + confidence, support overlap, and single-batch TubeField producer + re-evaluation before RIS merge; rejected history cannot become visible + fallback by itself. Multi-batch TubeField replay is invalid until a + producer-keyed replay manifest maps selected samples to their source buffer + and constants. Spatial reuse validates neighboring current reservoirs by field id, travel, normal, support overlap, and domain before merge. Current-frame structural proposal assembly has a visibility gate before RIS: if two valid proposals at the same pixel differ diff --git a/state/scratch.md b/state/scratch.md index eb25576..0c78edb 100644 --- a/state/scratch.md +++ b/state/scratch.md @@ -2,8 +2,8 @@ ## Current Slice -Extend the first Perfect Fensalir Machine reservoir cut from native-domain row -state into producer-domain replay/re-evaluation. +Extend native-domain reservoir replay from the first single-batch TubeField +proof path into SDF replay and producer-keyed multi-batch replay. ## Hot Lesson @@ -17,14 +17,20 @@ semantic domains and a dynamic contribution tree into bounded GPU reservoirs. The current nine-lane row ABI now carries first-class selected domain/sample-coordinate authority. A row keyed only by pixel, travel, field id, guide, proposal, and stats is no longer accepted as valid reservoir evidence. +TubeField row samples store selected UV, logical column, curve coordinate, +support footprint, domain kind, and shift kind; field id carries physical +rolling-column identity. The history pass can bind exactly one TubeField replay +batch and re-evaluate shifted TubeField history against that live source buffer. +Multiple TubeField batches are intentionally not replay-authoritative yet. ## Next Bounded Move Follow `docs/perfect-fensalir-machine-roadmap.md` Phase 1: -1. Implement producer re-evaluation after the support-overlap gate for - TubeField rolling-column replay. -2. Implement SDF object-hit replay/re-evaluation for shifted history. +1. Implement SDF object-hit replay/re-evaluation for shifted history. +2. Add a producer-keyed TubeField replay manifest so multi-batch TubeField + history can bind the correct source buffer/constants instead of being + rejected. 3. Capture the occluded-spectrum-tubes scene in baseline/native-domain modes after replay is real, not merely support-overlap filtered.