From 60e3b8cb1c23e21015f94c1e6c3dc25b6e5d81ab Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 23 Aug 2024 22:14:33 +1000 Subject: [PATCH] test/data: add bricks-color.etc1s.pkm --- std/etc2/decode_etc2.wuffs | 3 +++ test/data/README.md | 4 +++- test/data/bricks-color.etc1s.pkm | Bin 0 -> 9616 bytes test/nia-checksums-of-data.txt | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 test/data/bricks-color.etc1s.pkm diff --git a/std/etc2/decode_etc2.wuffs b/std/etc2/decode_etc2.wuffs index 11e903ca..d43db3fa 100644 --- a/std/etc2/decode_etc2.wuffs +++ b/std/etc2/decode_etc2.wuffs @@ -31,6 +31,9 @@ // // https://registry.khronos.org/OpenGL/specs/es/3.0/es_spec_3.0.pdf // https://registry.khronos.org/OpenGL/specs/es/3.2/es_spec_3.2.pdf +// https://registry.khronos.org/DataFormat/specs/1.3/dataformat.1.3.html#ETC1 +// https://registry.khronos.org/DataFormat/specs/1.3/dataformat.1.3.html#ETC1S +// https://registry.khronos.org/DataFormat/specs/1.3/dataformat.1.3.html#ETC2 // https://www.khronos.org/assets/uploads/developers/library/2012-siggraph-opengl-es-bof/Ericsson-ETC2-SIGGRAPH_Aug12.pdf // https://www.graphicshardware.org/previous/www_2007/presentations/strom-etc2-gh07.pdf // https://github.com/Ericsson/ETCPACK diff --git a/test/data/README.md b/test/data/README.md index db591ab1..0fb4873a 100644 --- a/test/data/README.md +++ b/test/data/README.md @@ -12,7 +12,9 @@ by the `script/convert-png-to-wbmp.go` command line tool. The `*.webp` versions were generated by the cwebp command line tool. The `*.no-ancillary.png` files were generated by the `script/strip-png-ancillary-chunks.go` command line tool. The `*.qoi` files were generated by the qoiconv command line tool. The `*.pkm` -files were generated by the ETCPACK command line tool. +files were generated by the ETCPACK command line tool, except the `*.etc1s.pkm` +files were generated by a [custom +etc1tool](https://github.com/nigeltao/etc1tool). The `*.apng` files were generated by `gif2apng`. Those with finite animation loop counts were manually patched to correct for a `gif2apng` bug. diff --git a/test/data/bricks-color.etc1s.pkm b/test/data/bricks-color.etc1s.pkm new file mode 100644 index 0000000000000000000000000000000000000000..6e0c8a478a89fe7d4eabef411e47fc9389eec85e GIT binary patch literal 9616 zcmWIW_Ej)6U|?Waz)%6g0uvtOo#^Q3Fj(CBPM#w!jSxb=hKSGq*N1SZQF zhU+*yCNMoT=ILQ@=wK3RU|?WyXkhyP&w+u#qJfD41S~2Lv;zYJ1Bl;ofPq0F!R!A6 z27U&K2&RrRL8%N18BFQB8mt*KGML`IH#tyF&9XlI9bl(}y`y3Gkd5qsx zJ_<~@kk@g(`kcmr4{97e0vZM}e4GA|sN)g<%Xv`cI+s~>o~J>?u8pO zygGUqI&M5Tz{EJepaT?sNvi}UUi|pL^epAz%nJ{0Oghuiz|aw)vF-mG24)3=1h2kl z3>+LD6VwFWGx#w$Okn!2z`z3zzyBPNaDs*(2L~kF=CFXmw}Pqt|Ic~`i3m0OKMahZ z@M9EYU|>*)V5yjAjse_L5<`8hxZ%-GrW2}Fw}8G zEMQ{LWMJS(SfO_Aogjli#s;rQw>kzkN_ z=AEFxgpPnoKJO&&+<0+g5|jFwHc}r`(Mt$QQ^UnXUHJP zAmP!Wc49IEKZC~%rk@M~>U(Fvz+q6p^yUNuBZEN!)Bm?1dpgwE{(s09NZ7FLvjIbcfJX<@oB0>{ z1Ux1%ojLRWu7F2}*O@a63>*#(YVY3sy$MS1eD7-B8%)@-%~)RW07t@ty#EgvdO-BK z_W}$O4Lc^Cc{lT}#)Jct-kiC6SEAv>q`r3yj2aUzOnT9CfFZ&{!;9yA14F=!3)}i` z7cl<#@q_9AZw7`7AAU?qQ}}&<$Bz$_KC&phoN(gCwvP;7KL%JR2X8(hMnWMlWuj4%f zH$#O5)0q=DXLD#IK*|Y&0wxCe4hD{h6?ww-C(I=#Jjnap@kId?PXBH`0Ecr&hk&4f zK>^dda||3D8W~JF3=GVmbj$w#gSf+n2iq9>`S}GRW^DWafq`GZp@Hd4-|oEv9vx~O zJq;Zo`b5V<4i0em-9WT-LkJ<&yb;^)^U!Zhr^*j zZAM2&2S>mRHO|>}H#sUUc%A5M=#VJbktgx*!2t$~0=4gn3_PH4KG(v)0H)u8=mI8& zJp~L54imiC|2HrgY3?0IP0tN|8ANZO1K;<-p z2Ll6#MTZ*0{}242a_npI2L=v{3bmg1))NFg8kjgb1RDebI+)&_<6r>M@6X&90EPRB zjt&M61&6%1Oc zk1#N3WT+Wi3r=LvNKgwe7GP#ji0~=~g`-A-8uR}OMv%C%y`%txMgo($^32s585RGG z?T;{YoVajHP*~YCU_ryJ{|%q*LE%>oikAorCI<6jMvI7wf92&J9R>kVI-&v0w@By! z(*_9>Zk3mJoPp9E0TCS_e#eZC6}Jq{=Wb4DIIyj_m_brw#fLnG|A!br{`_z7jh{my zfay#E1A~S}#H8~24u%Me1g~P_-@gScDkg!-F^P-~lbHX%kk43g;nrWFPiF)SGSu=v zH!x@zBy9U$#?T<3kpL=hXK-jFsJ%PWF%gs=-kdlwkwGCq?ScIP9tH&urW5}K>^UM9 zFz`X?f-4 z3=S1uYH3PJ3?2=iUi0IGk8Qws*KkgNL1M;*yf^Oz1wr&XZ1jQ)pn6+SV!@3(u>67xU^-&Kg=3In&YWpb_CEX>IDTLczl8%$cqCPH1>Ao$1>% z|3b!uTaxdM1STxFFo}KlgU|^H4gdb0U|?Rrq2cxJEhFO&2?MnU=LPv2BpkLG3mOY3 zNOzyJy#V`D)<5MR)kK@cQwY<{AXA!3D^v2n))hKwC*#>O*eGZdUq6E?m%o1tQX z*H6I@9Sji;O#i<#Ffb%Ic%Az%zyQjx|K}8QGej6L{b+AsU`Q}foBm&cU83Otlfo

tKCV+V%>)7wQ%f*_i&Cy`-+gn=4EzcJqq4G*uL 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 literal 0 HcmV?d00001 diff --git a/test/nia-checksums-of-data.txt b/test/nia-checksums-of-data.txt index 0ec5e4f7..a7c5bfcf 100644 --- a/test/nia-checksums-of-data.txt +++ b/test/nia-checksums-of-data.txt @@ -26,6 +26,7 @@ OK. e08a7cc8 test/data/artificial-png/exif.png OK. e08a7cc8 test/data/artificial-png/key-value-pairs.png OK. 076cb375 test/data/bricks-color.bmp OK. bdbbfadb test/data/bricks-color.etc1.pkm +OK. 41e6110e test/data/bricks-color.etc1s.pkm OK. 5670f263 test/data/bricks-color.etc2.pkm OK. 72a1f9cc test/data/bricks-color.jpeg OK. 076cb375 test/data/bricks-color.lossless.webp