From e8b268bce4ece5ebf87fee5f75ac1a6b431f3a5b Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Fri, 3 Apr 2026 13:52:20 -0700 Subject: [PATCH] replace AutoresolveDifferingSampleCounts test It's not clear what this test was trying to test and its golden was wrong. Removed this test, and replaced it with a simple "autoresolve" test. --- .../test/expected_images/Autoresolve.png | Bin 0 -> 3786 bytes .../AutoresolveDifferingSampleCounts.png | Bin 3763 -> 0 bytes filament/backend/test/test_Autoresolve.cpp | 42 +++--------------- 3 files changed, 6 insertions(+), 36 deletions(-) create mode 100644 filament/backend/test/expected_images/Autoresolve.png delete mode 100644 filament/backend/test/expected_images/AutoresolveDifferingSampleCounts.png diff --git a/filament/backend/test/expected_images/Autoresolve.png b/filament/backend/test/expected_images/Autoresolve.png new file mode 100644 index 0000000000000000000000000000000000000000..956a1229d88497b0361ae7542bb6bcb690df1a90 GIT binary patch literal 3786 zcmXBWd2keE8V2yEKN{!}h|@EHAb~jPnPh?l4I&A0PC^qBNJ18LITV;hT!96g)m_YT zejrDNGsqS0+0w!+S{OB@S!AItOT^+ZD8Z-!r%Fm$M2JU03S8KyyZPtG+wYg^_x-Nv zcxAS6E&MWldthl^rvHloh3B;S*JRf4VSW zNAJf|B86{Wy0o|j`U%I~9tDt`8^T)Gw;G6cF-((9!yL@}Mu^O0t<1^Ulrq=IVTYhyt|D$Wumx?!2 zAhGKi*Dc?<#$R+@@vCd&UtH^dbgjE30!1n!g*Q4!R%wtkPpFPXCptPBCptNb6K?+U zb&u3oU;JVkbOU(hNC6BJ2>oq2Ocq-5=L*+Z(_LpSaE&f=oIJ1Gb@nvZS@T_^OC4)- z$GGNaJJ(jwx5WyIye{KGrnQY4~W9+xW0^L!Ee7(@4i9@3;-L zM-MoKwtY0+DKxOqd9QWzrt5{9-RwH7_im;*?r_SD4i(8TpBAgu7z46glb>;N)4kZt zx!vu@XQY=OZ`qL#Gjs)yg|LYmGyb2O<&&r-4qJ9g&$LS;1mnQ>}|E#^aF>kWV!^g~TK z6^SmyBNBd6C=%&J5s4s4QzMhu8F`L`)yPYvvudTVm;;)e#%Uhm#ZXT3?*S|f3TR3_ zm#2QXQs0jZQtAhi{!0B&lBGxuEj36!Xdv28$mMa!`5Kn7hxY<#->PBuc(m1$a zx!f=&Gnbo%$;{;jF`2pCOiX63ER2)fIAvKl$suJyoaFu~%fv~JY^^{I`)u5fz#}?h z=}KgQfn*OMe>Y*pgzQBsg&acigq%veLM|fTs2IfQdSAm;?$n(g%;g5y$%wq}!6NSB z*EQTGYZMWt|QQ86wQ7D&A!7W5V2O z!W?UTlevy6W-<3E$rLh9IHZ&Wh4c`P+~dK?u__9DsM)1~YZ%}LZ;c?*(Lm2KM7om_ zM6w8{bP!=~w1KLvkcUjPbyBcBj-;WWnFs}as*wyS;DJi23igqJf{O&qaYz?|Bb;V3 zgbU$kL^=p8WTD)1*LdWHNgVu9 z!k5*^DJP7^0XKA|lJC0|7Kz>pHe`xKDhY~2SCS~=#~1cviE8>L3(@;ckB$p#fM zo{zpBB$pZZoEK4V0~5$FMy&8@Mr4VB9e!B7h!55f!XZ-$bBhcd^dpi&e28QaUepg0 zFCrrhEMS9sO|*^${t-vxM&Jd%66>Pia#%zMD>xqz(HxQ~qCJTrq8bT`+lN|O)qP5B3Y}+j|i`J-T_T)=@AbSycuoS*?3Z*<9;$y$8y%2 zVdD2<;Eq>mTMyhcM8Hr{&pTM4Wt$d#k?ho>&yYP@bfQ2+tH4BnRqNClyxEkl&MmhCD&~8S)^RWTKk~GHBuqzh+)Fv5^ckQBK}vj`TC}F^9Zi zVl{cG8tZ&qN1u`!0*bv#YLMtkDnD+D`7o3CmDB)mJs?UdfY#A!O)b#4RSWc05G&9l zMf^_dq(>elJ@kk{vh|3Mx_!X9}St#LQk9El;W#67O;1FTi59vx*)_aK9IiGU06nG*_RJ{z; zm8r2Uq(Y6Y0Io#T829UyA~m*>m};zs6ss{wO4PQF{Knj_C2e+TNe|hlB^7>`vQXZs z(KJKe&uOkOF_Kfs6I=vbD^=(5U|buk^5YKI%G7y07}qM)c`PCz@>yT|TCHUrkep#e z(*@+WaoJx3?uNwIeqdO(m}(OiUvnXjG9pXL)dnua;9|9bjSa3)8@LdI$EXeLZ}50^ zTbL_QtZw5JG*+nFvVf}1S`OdWHbSrDj)`{FEBV4`Z@qF2$<-^_ZFHDkv!7LD7=b|w ztfgjTDvMbhm)lg}mS6cVYx>@+{L4mH=Ggd@zBYd4ln1!rRmR!q$|*j);8Vug_?0jC z@CC0jk^JISzTm?bbY&v>MOWTuXO}}_0V_N?PHp88sM(`6uI9vy)bsWNiB5XnHj<*} zZ6H1Lyj3JaZ_8H@DL0b+S>X}WdX{``TKtWZw@qsf$uO`A=M~CI5>{E*WkH#4=87%UZ3SH(Y(1?$!B+ed4@`t%LcSZI0z{vbmJM zks!U8TSHd=WJCaKeEMiR+MI8X$AS4?MF1IdGHmwG>1{K8PA{8dpXUj_wfDJPhvpoc zz2`y>%>kRI|1iwq$-y>9U!AS8zN$$dYF;3(=xv9w|8$tJ#bN3So7mdRdVuTra6D+& zwC|N-yQUAaHrO={46V0$H?+=)vYbNS&8oJeez|sIcq7*t*{{DdJ$U z?J9F}UzNGJi%w_n92sC2I&0xXyU>%@*Vx5WewcLl*mC$Z;c!MeoZDj;nmANou+Ye} zX+fL6r#VsQuoI<)ohaPdi3&P9(U=*gWJ`yqJDlC`a6QAJ&l0D!58A!Ty=iwm$ZNiJ cL)U*^{^Md#{(H|JI|cqL9bI7_E{d-FKL)O?8vpIVwVg3U~y$ zJl!P;26;4ufNK>?3*r_P;)6P#);4mYo_bJH0iCwNqQ#g~d87i;@65nIAAb9t-`=@* z?%Zs=x@vOY-h+Ar=vzL;x(g8euYh(9IlJuWPeh$pTv-fded3nW+vWiM9xJzsXDn;^ z{)?&GPLAzo7T@s0%1=+OS@ia2+kXgu8_z*mJ?bOx>9E)TJn+hWmjxonUXKM8B)895 znWqECd(Iup6Nsk1|Lpx1@aBclFlgb0vA*Xg_?{c*dv>Dl;$gmvuI5jU@atMX&saL# zt234q`JTH6RtzXO{UhArtJ{l|V75S_@uCQos4(>l*O+THNYT|_YP_$H8Umj2hE&h; zhQ6MGhO2q|)x7;`-hMT2_w%~f{5d;4{#fBl+M zeY`s5l;5|ev!7pg`u$_}>d*~f!Hj%wf+t>?y@?w6Xq2|6iHrMMHcOW*SC zb*dJo5j%NW^2*pW)d~bl1->#mTW`~vt$f4 z%#spqri#dRv~k%Zo6u&FINHj{Dzr@@O=#n+BaLXglf=+gMI`pHuXeOjy-tHuCK73U zYbsUqR?a0$lN&gfA!(Qy2PTFvG+n{{IrzOx2;;b;TXOJ@3oFj^239Vt(iFUxjdxsF zv0(x$mk^eO1bWJFhBw;14jplhJ4Q)naSb(D6o>piAZHV9<(=e-fILZt2Vn7aR&j;H z-KXQyWEJx#p?i#uWG}^@W*||d*mKFPioKW&SM0}0u3|q!1}pY0WPoBnN%|`G?Sy?# zlL?B=*(M4V`zbO^vFBMZ%Z2=u!!A;BfdlT=&=nRq62ytADz=2s`l5y@(-2utDiPU8 zrXsS9lq0f>Oh)86Qi{m)WD+93CdG)bucit~_SIA%$-bI0B-vL}f+YKzs?fNGRG^XV zO=W1TBPD3$w`4NgOqlV@GMVil%=n$HJCV3XNA1muIoN=6n~?W%xrVDa7lV90fXDbC zhUhrT-9I87M|t**V3jXWm5#G~9#uNd@?h%6${?&b-LKMcmfQ9L!oFREeK!*JJsZRs zZpKTcNcPv!{T!kr4TKC8<2jO$m2pHD3%P>K74k5dF8BbG*^2wRc5H-P$*8wj^~CE=s)8^BoZmyb1!*&0Wp8E(jrE=vY1l=1c=U67q%i zxkN>6y(VW7X19@zn!JuM`!8wGccq$cH*kV9ljGa3M{p zUJZ2Ri%^k*`fL%pm4roTILQ^ET*7Ryf_7#D2s7SjJF{LSUqo+LurFIgZz5q4y`JQX zXn-&qr=T+=qC*KU8AJ>b?M-;)Sdt^61%wTmBu_-Sr#kb6vqWG|v1-4@WBxf!9@mh# zPRF4j%pwC5^B|ioEa#c}R2;2$0&fvk=i(S!2^7UJmMgk~Fgr|`U5;VdRAzB3D`!S3 zn2{;W;^-*`o(U@50~MT^q}oIH*R4*Iu^?P+U$?L$2z(vKZ6V-BT`9~5c9A^b0g?-RMfmtP29?4vNmB~>Q{WR;*@PAQ z_6L;=_U%toGT1jUTNLnamshCOjX>)fEy2aA9jKc;YMd%V8vKQD(n2o|uUq&i0Qn0G zak9xmIr*D~0J)wSFS&;q+0Kmoof#Qmp^lf#w2(@+vf_uIvm$*gZ03iXisDQY(lvFfdwlOm89 zrQ4-soNo6bDY{)wQgu5((sjF-Wa%~!nnYN)v&hZ5ok~XQb~+ia+x(X3wT4{Cr5Ish z4u{_v!?PUzU0qoVbZpi-c9E@GM>E;3b!;O$wT>46Q=QLE(A{58a(mk=Et~HXR;DZW z@i|_~5nu94Cgh2GUGl}3X~27|Tv+kP<_%$SuL~$(zXkV)7qu7MCx% zSzJEoW^tMAW^s9(+x)Sha)@_-G+Qj-e%({5o+tsTpVxYtfJC0&&7UgfY{MBvo-iE# z-7;4gP9f=UI2mM!;Y7$t!{JW=^A5w|(PBf#=o%RP1kJYN35WA7@DH;O&pRa_FQcZ5xD^8sVL=~gV*;7;Q6 z6G3+pLw}06lbCU?*qy|lGY@%mmAIUC9`^XB<%smGaek1p?9IzBk$ lE=96#q&s{x|NXFYWm(J5!|FeI^xxpW^3p16e@S%p{{h{+r0f6y diff --git a/filament/backend/test/test_Autoresolve.cpp b/filament/backend/test/test_Autoresolve.cpp index b01d65a27d..381d7d6404 100644 --- a/filament/backend/test/test_Autoresolve.cpp +++ b/filament/backend/test/test_Autoresolve.cpp @@ -31,10 +31,7 @@ using namespace filament; using namespace filament::backend; using namespace filament::math; -TEST_F(BackendTest, AutoresolveDifferingSampleCounts) { - SKIP_IF(SkipEnvironment(OperatingSystem::CI, Backend::OPENGL), "see b/486954356"); - SKIP_IF(SkipEnvironment(OperatingSystem::CI, Backend::VULKAN), "see b/486954356"); - +TEST_F(BackendTest, Autoresolve) { auto& api = getDriverApi(); constexpr int kRenderTargetSize = 512; @@ -61,33 +58,7 @@ TEST_F(BackendTest, AutoresolveDifferingSampleCounts) { TextureFormat::RGBA8, 1, kRenderTargetSize, kRenderTargetSize, 1, TextureUsage::COLOR_ATTACHMENT | TextureUsage::SAMPLEABLE)); - // First render pass: render a red triangle to a RenderTarget with 8 samples. - { - Handle renderTarget = - addCleanup(api.createRenderTarget(TargetBufferFlags::COLOR, kRenderTargetSize, - kRenderTargetSize, 8, 1, { { texture } }, {}, {})); - - shader.uploadUniform(api, ubuffer, - SimpleMaterialParams{ - .color = float4(1, 0, 0, 1), - }); - - RenderPassParams params = getClearColorRenderPass(float4(0)); - params.viewport = { 0, 0, kRenderTargetSize, kRenderTargetSize }; - - RenderFrame frame(api); - api.beginRenderPass(renderTarget, params); - ps.primitiveType = PrimitiveType::TRIANGLES; - ps.vertexBufferInfo = triangle.getVertexBufferInfo(); - api.bindPipeline(ps); - api.bindRenderPrimitive(triangle.getRenderPrimitive()); - api.draw2(0, 3, 1); - api.endRenderPass(); - api.commit(swapChain); - } - - // Second render pass: render a green triangle to a RenderTarget with 4 samples, attached to - // the same texture. + // render a red triangle to a RenderTarget with 4 samples. { Handle renderTarget = addCleanup(api.createRenderTarget(TargetBufferFlags::COLOR, kRenderTargetSize, @@ -95,10 +66,10 @@ TEST_F(BackendTest, AutoresolveDifferingSampleCounts) { shader.uploadUniform(api, ubuffer, SimpleMaterialParams{ - .color = float4(0, 1, 0, 1), + .color = float4(1, 0, 0, 1), }); - RenderPassParams params = getClearColorRenderPass(float4(0)); + RenderPassParams params = getClearColorRenderPass(float4(1)); params.viewport = { 0, 0, kRenderTargetSize, kRenderTargetSize }; RenderFrame frame(api); @@ -109,11 +80,10 @@ TEST_F(BackendTest, AutoresolveDifferingSampleCounts) { api.bindRenderPrimitive(triangle.getRenderPrimitive()); api.draw2(0, 3, 1); api.endRenderPass(); + api.commit(swapChain); EXPECT_IMAGE(renderTarget, ScreenshotParams(kRenderTargetSize, kRenderTargetSize, - "AutoresolveDifferingSampleCounts", 1048576)); - - api.commit(swapChain); + "Autoresolve", 545665143)); } }