From 915cf400aaf1b2cb54257b1e3c2278dce4cf4d03 Mon Sep 17 00:00:00 2001 From: JordanTheToaster Date: Tue, 14 Jan 2025 09:14:32 +0000 Subject: [PATCH 1/4] Deps: Update libpng to 1.6.45 --- .github/workflows/scripts/linux/build-dependencies-qt.sh | 4 ++-- .../workflows/scripts/macos/build-dependencies-universal.sh | 4 ++-- .github/workflows/scripts/macos/build-dependencies.sh | 4 ++-- .../workflows/scripts/windows/build-dependencies-arm64.bat | 4 ++-- .github/workflows/scripts/windows/build-dependencies.bat | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/scripts/linux/build-dependencies-qt.sh b/.github/workflows/scripts/linux/build-dependencies-qt.sh index ae16e6bf43075..2e1108b4ef99a 100755 --- a/.github/workflows/scripts/linux/build-dependencies-qt.sh +++ b/.github/workflows/scripts/linux/build-dependencies-qt.sh @@ -16,7 +16,7 @@ fi LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075 LIBJPEG=9f -LIBPNG=1.6.44 +LIBPNG=1.6.45 LIBWEBP=1.4.0 LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29 SDL=SDL2-2.30.11 @@ -34,7 +34,7 @@ cd deps-build cat > SHASUMS < Date: Tue, 14 Jan 2025 09:29:38 +0000 Subject: [PATCH 2/4] Deps: Update webp to 1.5.0 --- .github/workflows/scripts/linux/build-dependencies-qt.sh | 4 ++-- .../workflows/scripts/macos/build-dependencies-universal.sh | 4 ++-- .github/workflows/scripts/macos/build-dependencies.sh | 4 ++-- .../workflows/scripts/windows/build-dependencies-arm64.bat | 4 ++-- .github/workflows/scripts/windows/build-dependencies.bat | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/scripts/linux/build-dependencies-qt.sh b/.github/workflows/scripts/linux/build-dependencies-qt.sh index 2e1108b4ef99a..f0d9d8742a8dd 100755 --- a/.github/workflows/scripts/linux/build-dependencies-qt.sh +++ b/.github/workflows/scripts/linux/build-dependencies-qt.sh @@ -17,7 +17,7 @@ fi LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075 LIBJPEG=9f LIBPNG=1.6.45 -LIBWEBP=1.4.0 +LIBWEBP=1.5.0 LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29 SDL=SDL2-2.30.11 QT=6.8.1 @@ -35,7 +35,7 @@ cat > SHASUMS < Date: Tue, 14 Jan 2025 09:56:50 +0000 Subject: [PATCH 3/4] 3rdparty: Update promptfont with new icons --- 3rdparty/promptfont/promptfont.sfd | 291 +++++++++++++++++++++++++---- bin/resources/fonts/promptfont.otf | Bin 245668 -> 249880 bytes 2 files changed, 252 insertions(+), 39 deletions(-) diff --git a/3rdparty/promptfont/promptfont.sfd b/3rdparty/promptfont/promptfont.sfd index 3226bc962aaae..03ec48c0c425c 100644 --- a/3rdparty/promptfont/promptfont.sfd +++ b/3rdparty/promptfont/promptfont.sfd @@ -23,7 +23,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 0 CreationTime: 1544355305 -ModificationTime: 1712653578 +ModificationTime: 1736751870 PfmFamily: 33 TTFWeight: 400 TTFWidth: 5 @@ -65,7 +65,7 @@ NameList: AGL For New Fonts DisplaySize: -48 AntiAlias: 1 FitToEm: 0 -WinInfo: 8816 38 14 +WinInfo: 8360 38 14 BeginPrivate: 8 BlueValues 29 [0 0 380 380 490 490 660 660] OtherBlues 39 [-210 -210 -180 -180 -160 -160 280 280] @@ -77,7 +77,7 @@ StemSnapV 13 [140 180 200] ForceBold 4 true EndPrivate TeXData: 1 0 0 335544 167772 111848 513802 1048576 111848 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 1114112 731 +BeginChars: 1114112 733 StartChar: exclam Encoding: 33 33 0 @@ -19511,40 +19511,40 @@ VStem: 92.5596 41.7305<171.236 408.764> 189.39 149.051<176.142 403.858> 699.66 1 LayerCount: 2 Fore SplineSet -500 600.610351562 m 1 - 671.459960938 600.610351562 810.610351562 461.459960938 810.610351562 290 c 0 - 810.610351562 118.540039062 671.459960938 -20.6103515625 500 -20.6103515625 c 0 - 328.540039062 -20.6103515625 189.389648438 118.540039062 189.389648438 290 c 0 - 189.389648438 461.459960938 328.540039062 600.610351562 500 600.610351562 c 1 -699.66015625 102.129882812 m 1 - 699.66015625 167.830078125 l 1 - 456.870117188 167.830078125 l 1 - 456.870117188 463.459960938 l 1 - 338.440429688 463.459960938 l 1 - 338.440429688 102.129882812 l 1 - 699.66015625 102.129882812 l 1 -500 -117.440429688 m 0 - 445 -117.440429688 391.639648438 -106.66015625 341.400390625 -85.41015625 c 0 - 292.879882812 -64.8896484375 249.309570312 -35.509765625 211.900390625 1.900390625 c 0 - 174.490234375 39.3095703125 145.110351562 82.8798828125 124.58984375 131.400390625 c 0 - 103.33984375 181.639648438 92.5595703125 235.009765625 92.5595703125 290 c 0 - 92.5595703125 344.990234375 103.33984375 398.360351562 124.58984375 448.599609375 c 0 - 145.110351562 497.120117188 174.490234375 540.690429688 211.900390625 578.099609375 c 0 - 249.309570312 615.509765625 292.879882812 644.889648438 341.400390625 665.41015625 c 0 - 391.639648438 686.66015625 445.009765625 697.440429688 500 697.440429688 c 0 - 554.990234375 697.440429688 608.360351562 686.66015625 658.599609375 665.41015625 c 0 - 707.120117188 644.889648438 750.690429688 615.509765625 788.099609375 578.099609375 c 0 - 825.509765625 540.690429688 854.889648438 497.120117188 875.41015625 448.599609375 c 0 - 896.66015625 398.360351562 907.440429688 344.990234375 907.440429688 290 c 0 - 907.440429688 235.009765625 896.66015625 181.639648438 875.41015625 131.400390625 c 0 - 854.889648438 82.8798828125 825.509765625 39.3095703125 788.099609375 1.900390625 c 0 - 750.690429688 -35.509765625 707.120117188 -64.8896484375 658.599609375 -85.41015625 c 0 - 608.360351562 -106.66015625 554.990234375 -117.440429688 500 -117.440429688 c 0 -500 655.709960938 m 0 - 298.349609375 655.709960938 134.290039062 491.66015625 134.290039062 290 c 0 - 134.290039062 88.33984375 298.33984375 -75.7099609375 500 -75.7099609375 c 0 - 701.66015625 -75.7099609375 865.709960938 88.349609375 865.709960938 290 c 0 - 865.709960938 491.650390625 701.66015625 655.709960938 500 655.709960938 c 0 +500 600.610351562 m 5 + 671.459960938 600.610351562 810.610351562 461.459960938 810.610351562 290 c 4 + 810.610351562 118.540039062 671.459960938 -20.6103515625 500 -20.6103515625 c 4 + 328.540039062 -20.6103515625 189.389648438 118.540039062 189.389648438 290 c 4 + 189.389648438 461.459960938 328.540039062 600.610351562 500 600.610351562 c 5 +699.66015625 102.129882812 m 5 + 699.66015625 167.830078125 l 5 + 456.870117188 167.830078125 l 5 + 456.870117188 463.459960938 l 5 + 338.440429688 463.459960938 l 5 + 338.440429688 102.129882812 l 5 + 699.66015625 102.129882812 l 5 +500 -117.440429688 m 4 + 445 -117.440429688 391.639648438 -106.66015625 341.400390625 -85.41015625 c 4 + 292.879882812 -64.8896484375 249.309570312 -35.509765625 211.900390625 1.900390625 c 4 + 174.490234375 39.3095703125 145.110351562 82.8798828125 124.58984375 131.400390625 c 4 + 103.33984375 181.639648438 92.5595703125 235.009765625 92.5595703125 290 c 4 + 92.5595703125 344.990234375 103.33984375 398.360351562 124.58984375 448.599609375 c 4 + 145.110351562 497.120117188 174.490234375 540.690429688 211.900390625 578.099609375 c 4 + 249.309570312 615.509765625 292.879882812 644.889648438 341.400390625 665.41015625 c 4 + 391.639648438 686.66015625 445.009765625 697.440429688 500 697.440429688 c 4 + 554.990234375 697.440429688 608.360351562 686.66015625 658.599609375 665.41015625 c 4 + 707.120117188 644.889648438 750.690429688 615.509765625 788.099609375 578.099609375 c 4 + 825.509765625 540.690429688 854.889648438 497.120117188 875.41015625 448.599609375 c 4 + 896.66015625 398.360351562 907.440429688 344.990234375 907.440429688 290 c 4 + 907.440429688 235.009765625 896.66015625 181.639648438 875.41015625 131.400390625 c 4 + 854.889648438 82.8798828125 825.509765625 39.3095703125 788.099609375 1.900390625 c 4 + 750.690429688 -35.509765625 707.120117188 -64.8896484375 658.599609375 -85.41015625 c 4 + 608.360351562 -106.66015625 554.990234375 -117.440429688 500 -117.440429688 c 4 +500 655.709960938 m 4 + 298.349609375 655.709960938 134.290039062 491.66015625 134.290039062 290 c 4 + 134.290039062 88.33984375 298.33984375 -75.7099609375 500 -75.7099609375 c 4 + 701.66015625 -75.7099609375 865.709960938 88.349609375 865.709960938 290 c 4 + 865.709960938 491.650390625 701.66015625 655.709960938 500 655.709960938 c 4 EndSplineSet Validated: 5 EndChar @@ -30101,7 +30101,7 @@ SplineSet 79 -59.400390625 120 -102.200195312 170.799804688 -102.200195312 c 2 838.200195312 -102.200195312 l 2 EndSplineSet -Validated: 524321 +Validated: 33 EndChar StartChar: uni23F6 @@ -30171,7 +30171,7 @@ SplineSet 79 -59.400390625 120 -102.200195312 170.799804688 -102.200195312 c 2 838.200195312 -102.200195312 l 1 EndSplineSet -Validated: 524321 +Validated: 33 EndChar StartChar: uni23F7 @@ -35271,5 +35271,218 @@ SplineSet EndSplineSet Validated: 1 EndChar + +StartChar: uni2446 +Encoding: 9286 9286 731 +Width: 1000 +HStem: 98.667 78.666<441.304 558.479> 298.667 80.666<211.095 321.99 686.039 796.635> 364 81.333<440.808 559.266> 544.667 80.666<210.809 321.868 685.514 796.925> +VStem: 104 80<406.859 516.049> 326.667 80<269.844 311.038> 349.333 80<429.563 517.407> 578.667 80<424.535 517.66> 593.333 80.667<270.25 314.708> 824 80<406.439 515.845> +LayerCount: 2 +Fore +SplineSet +869.333007812 361.333007812 m 1x9840 + 887.333007812 310.666992188 925.333007812 194 915.333007812 116.666992188 c 0 + 902 10.6669921875 842.666992188 -30.6669921875 836 -35.3330078125 c 0 + 832 -38.6669921875 827.333007812 -40 822 -41.3330078125 c 0 + 812 -43.3330078125 802 -44 792 -44 c 0 + 770.666992188 -44 750 -39.3330078125 732.666992188 -30.6669921875 c 0 + 708 -18.6669921875 690 1.3330078125 676 30 c 0 + 654 76 656 148 662 194.666992188 c 1 + 661.333007812 194 658.666992188 194.666992188 655.333007812 195.333007812 c 0 + 627.333007812 138 568 98.6669921875 500 98.6669921875 c 0 + 431.333007812 98.6669921875 372 138.666992188 344 196 c 0 + 340 195.333007812 336 194 334.666992188 194.666992188 c 1 + 342.666992188 135.333007812 344.666992188 73.3330078125 324 30 c 0 + 310 1.3330078125 291.333007812 -18.6669921875 267.333007812 -30.6669921875 c 0 + 241.333007812 -43.3330078125 210 -46.6669921875 178 -40.6669921875 c 0 + 172.666992188 -40 168 -38 164 -35.3330078125 c 0 + 157.333007812 -31.3330078125 98 10.6669921875 84.6669921875 116.666992188 c 0 + 74.6669921875 199.333007812 116 323.333007812 133.333007812 369.333007812 c 1 + 114.666992188 396 104 428 104 462.666992188 c 0 + 104 552 176.666992188 625.333007812 266.666992188 625.333007812 c 0 + 299.333007812 625.333007812 329.333007812 615.333007812 354.666992188 599.333007812 c 1 + 385.333007812 646 436 677.333007812 492.666992188 681.333007812 c 0 + 557.333007812 685.333007812 619.333007812 653.333007812 655.333007812 600 c 1 + 680.666992188 615.333007812 710 624.666992188 741.333007812 624.666992188 c 0 + 830.666992188 624.666992188 904 552 904 462 c 0 + 904 424 891.333007812 389.333007812 869.333007812 361.333007812 c 1x9840 +741.333007812 544.666992188 m 0 + 695.333007812 544.666992188 658.666992188 507.333007812 658.666992188 462 c 0 + 658.666992188 416.666992188 696 379.333007812 741.333007812 379.333007812 c 0xd940 + 786.666992188 379.333007812 824 416.666992188 824 462 c 0 + 824 507.333007812 786.666992188 544.666992188 741.333007812 544.666992188 c 0 +498 601.333007812 m 0 + 459.333007812 598.666992188 426 572.666992188 411.333007812 536.666992188 c 0 + 422.666992188 514.666992188 429.333007812 489.333007812 429.333007812 462.666992188 c 0 + 429.333007812 450.666992188 428 439.333007812 426 428.666992188 c 1 + 448 439.333007812 473.333007812 445.333007812 500 445.333007812 c 0xbb40 + 530.666992188 445.333007812 558.666992188 437.333007812 583.333007812 424 c 1 + 580 436 578.666992188 448.666992188 578.666992188 462 c 0 + 578.666992188 490 585.333007812 516 598 539.333007812 c 0 + 580 579.333007812 540 604 498 601.333007812 c 0 +266.666992188 544.666992188 m 0 + 220.666992188 544.666992188 184 507.333007812 184 462 c 0 + 184 416.666992188 221.333007812 379.333007812 266.666992188 379.333007812 c 0xda40 + 312 379.333007812 349.333007812 416.666992188 349.333007812 462 c 0 + 349.333007812 507.333007812 312 544.666992188 266.666992188 544.666992188 c 0 +305.333007812 270 m 2 + 310.666992188 271.333007812 318.666992188 273.333007812 326.666992188 274 c 0xdc40 + 326.666992188 287.333007812 328 300 331.333007812 312 c 1 + 311.333007812 303.333007812 290 298.666992188 266.666992188 298.666992188 c 0 + 240.666992188 298.666992188 216 305.333007812 194 316 c 1 + 174.666992188 259.333007812 152.666992188 176 159.333007812 123.333007812 c 0 + 164 82.6669921875 178 56 189.333007812 39.3330078125 c 0 + 198.666992188 26.6669921875 216 20.6669921875 230.666992188 28 c 1 + 234 29.3330078125 244 34.6669921875 254 56 c 0 + 273.333007812 96 260 180 255.333007812 212 c 2 + 255.333007812 212.666992188 l 2 + 251.333007812 236.666992188 267.333007812 259.333007812 293.333007812 266.666992188 c 2 + 305.333007812 270 l 2 +500 177.333007812 m 0 + 551.333007812 177.333007812 593.333007812 219.333007812 593.333007812 270.666992188 c 0 + 593.333007812 322 551.333007812 364 500 364 c 0xbcc0 + 448.666992188 364 406.666992188 322 406.666992188 270.666992188 c 0 + 406.666992188 219.333007812 448.666992188 177.333007812 500 177.333007812 c 0 +840.666992188 123.333007812 m 0 + 846.666992188 174.666992188 826 256 808 311.333007812 c 1 + 788 302.666992188 765.333007812 297.333007812 742 297.333007812 c 0 + 715.333007812 297.333007812 690 304 668 315.333007812 c 1 + 671.333007812 302 673.333007812 288 674 274 c 0 + 684 273.333007812 694.666992188 271.333007812 701.333007812 268 c 2 + 708.666992188 264.666992188 l 2 + 729.333007812 254.666992188 741.333007812 234.666992188 738 213.333007812 c 2 + 738 212 l 2 + 734 183.333007812 726.666992188 95.3330078125 746 55.3330078125 c 0 + 756 34 766 29.3330078125 769.333007812 27.3330078125 c 1 + 784 20.6669921875 801.333007812 26 810.666992188 39.3330078125 c 0 + 822 56 835.333007812 82.6669921875 840.666992188 123.333007812 c 0 +EndSplineSet +Validated: 524321 +EndChar + +StartChar: uni221B +Encoding: 8731 8731 732 +Width: 1000 +HStem: -209.992 21.2588<741.927 862.934> -160.664 62.5283<723.687 881.174> 85.9395 69.8691<723.687 780.459> 183.879 21.2588<741.929 862.934> +VStem: 594.865 21.2588<-62.9303 58.0754> 644.194 75.9316<-81.1715 76.316> 904.145 56.5225<-89.7754 -64.665> 988.736 21.2598<-62.9292 58.0743> +LayerCount: 2 +Fore +SplineSet +133.1953125 240.114257812 m 1 + 128.731445312 224.2734375 135.630859375 215.740234375 135.630859375 215.740234375 c 1 + 158.787109375 176.336914062 l 1 + 148.629882812 119.875976562 174.627929688 78.4345703125 190.466796875 57.7236328125 c 0 + 206.305664062 37.001953125 310.713867188 -99.0751953125 323.712890625 -114.518554688 c 0 + 336.711914062 -129.954101562 389.11328125 -183.991210938 445.583984375 -142.953125 c 0 + 502.044921875 -101.926757812 483.362304688 -32.052734375 483.362304688 -32.052734375 c 1 + 459.1875 57.931640625 l 1 + 589.7890625 74.3857421875 547.140625 186.911132812 547.140625 186.911132812 c 1 + 601.831054688 241.602539062 l 1 + 601.831054688 241.602539062 714.356445312 198.951171875 730.811523438 329.545898438 c 1 + 820.79296875 305.37890625 l 1 + 820.79296875 305.37890625 890.669921875 286.688476562 931.6953125 343.159179688 c 0 + 972.721679688 399.619140625 918.696289062 452.03125 903.262695312 465.030273438 c 0 + 887.829101562 478.029296875 751.73828125 582.424804688 731.018554688 598.275390625 c 0 + 710.296875 614.114257812 668.864257812 640.114257812 612.404296875 629.965820312 c 1 + 573.001953125 653.122070312 l 1 + 573.001953125 653.122070312 564.466796875 660.03125 548.627929688 655.55859375 c 2 + 548.627929688 655.55859375 543.954101562 661.450195312 532.172851562 654.5390625 c 0 + 520.391601562 647.627929688 493.986328125 630.569335938 477.126953125 596.651367188 c 1 + 477.126953125 596.651367188 474.28515625 591.78125 480.166015625 586.296875 c 1 + 480.166015625 586.296875 474.078125 568.424804688 482.6015625 555.021484375 c 0 + 491.13671875 541.616210938 501.688476562 524.559570312 501.688476562 524.559570312 c 1 + 264.205078125 287.03125 l 1 + 264.205078125 287.03125 247.146484375 297.59375 233.741210938 306.119140625 c 0 + 220.337890625 314.654296875 202.465820312 308.553710938 202.465820312 308.553710938 c 1 + 196.981445312 314.444335938 192.1015625 311.604492188 192.1015625 311.604492188 c 1 + 158.18359375 294.744140625 141.125 268.340820312 134.213867188 256.559570312 c 0 + 127.3046875 244.786132812 133.1953125 240.114257812 133.1953125 240.114257812 c 1 +829.455078125 781.646484375 m 1 + 829.455078125 781.645507812 l 1 + 792.041015625 795.248046875 760.869140625 792.16796875 741.635742188 772.922851562 c 0 + 733.508789062 764.796875 733.508789062 751.620117188 741.635742188 743.482421875 c 0 + 749.764648438 735.364257812 762.939453125 735.354492188 771.069335938 743.482421875 c 0 + 777.907226562 750.30859375 794.809570312 749.956054688 815.208007812 742.526367188 c 0 + 841.3828125 732.993164062 871.2109375 712.708007812 897.041015625 686.876953125 c 0 + 952.763671875 631.153320312 967.78125 575.046875 953.635742188 560.903320312 c 0 + 945.508789062 552.776367188 945.508789062 539.599609375 953.635742188 531.4609375 c 0 + 957.70703125 527.401367188 963.024414062 525.373046875 968.352539062 525.373046875 c 0 + 973.680664062 525.373046875 979 527.401367188 983.067382812 531.47265625 c 0 + 1019.61816406 568.0234375 995.288085938 647.485351562 926.47265625 716.319335938 c 0 + 896.052734375 746.73046875 861.592773438 769.926757812 829.455078125 781.646484375 c 1 +748.963867188 663.739257812 m 1 + 748.96484375 663.73828125 l 1 + 755.135742188 669.899414062 792.102539062 663.115234375 832.69140625 622.525390625 c 0 + 873.270507812 581.946289062 880.076171875 544.970703125 873.904296875 538.798828125 c 0 + 865.788085938 530.669921875 865.788085938 517.484375 873.915039062 509.357421875 c 0 + 877.984375 505.297851562 883.303710938 503.268554688 888.631835938 503.268554688 c 0 + 893.958984375 503.268554688 899.2890625 505.297851562 903.356445312 509.3671875 c 0 + 932.717773438 538.74609375 915.375976562 598.71484375 862.123046875 651.959960938 c 0 + 808.888671875 705.224609375 748.888671875 722.555664062 719.528320312 693.184570312 c 0 + 711.401367188 685.056640625 711.401367188 671.879882812 719.528320312 663.743164062 c 0 + 727.661132812 655.600585938 740.825195312 655.62109375 748.963867188 663.739257812 c 1 +213.166015625 -210 m 1 + 231.399414062 -210 247.083984375 -204.524414062 258.532226562 -193.078125 c 0 + 266.661132812 -184.94921875 266.661132812 -171.772460938 258.532226562 -163.635742188 c 0 + 250.403320312 -155.497070312 237.227539062 -155.506835938 229.098632812 -163.635742188 c 0 + 214.944335938 -177.799804688 158.858398438 -162.770507812 103.127929688 -107.0390625 c 0 + 77.3056640625 -81.208984375 57.01171875 -51.380859375 47.478515625 -25.2060546875 c 0 + 40.046875 -4.818359375 39.6826171875 12.095703125 46.5205078125 18.931640625 c 0 + 54.6494140625 27.0595703125 54.6494140625 40.2353515625 46.5205078125 48.3740234375 c 0 + 38.3935546875 56.5126953125 25.2177734375 56.5009765625 17.0888671875 48.3740234375 c 0 + -2.1630859375 29.1337890625 -5.2548828125 -2.056640625 8.3583984375 -39.4521484375 c 0 + 20.06640625 -71.5888671875 43.2763671875 -106.049804688 73.6953125 -136.470703125 c 0 + 120.946289062 -183.729492188 173.2109375 -210.008789062 213.166015625 -210 c 1 +138.03515625 -72.1201171875 m 1 + 160.764648438 -94.8388671875 186.5859375 -112.198242188 210.741210938 -120.9921875 c 0 + 223.53125 -125.655273438 234.375976562 -127.456054688 243.53515625 -127.456054688 c 0 + 262.7890625 -127.456054688 274.487304688 -119.473632812 280.627929688 -113.333007812 c 0 + 288.744140625 -105.204101562 288.744140625 -92.017578125 280.6171875 -83.890625 c 0 + 272.490234375 -75.7744140625 259.302734375 -75.7626953125 251.17578125 -83.890625 c 0 + 248.990234375 -86.1083984375 240.174804688 -87.408203125 224.979492188 -81.880859375 c 0 + 206.673828125 -75.2099609375 185.711914062 -60.921875 167.458007812 -42.67578125 c 0 + 149.212890625 -24.4306640625 134.924804688 -3.458984375 128.252929688 14.845703125 c 0 + 122.7265625 30.01953125 124.02734375 38.8251953125 126.245117188 41.041015625 c 0 + 134.374023438 49.16796875 134.374023438 62.34375 126.245117188 70.4833984375 c 0 + 118.116210938 78.6220703125 104.940429688 78.6103515625 96.8134765625 70.4833984375 c 0 + 87.748046875 61.4169921875 74.6875 40.279296875 89.1416015625 0.5966796875 c 0 + 97.9560546875 -23.5703125 115.315429688 -49.400390625 138.03515625 -72.1201171875 c 1 +802.430664062 155.80859375 m 0 + 715.083007812 155.80859375 644.194335938 84.919921875 644.194335938 -2.427734375 c 0 + 644.194335938 -89.775390625 715.083007812 -160.6640625 802.430664062 -160.6640625 c 0 + 889.778320312 -160.6640625 960.666992188 -89.775390625 960.666992188 -2.427734375 c 0 + 960.666992188 84.919921875 889.778320312 155.80859375 802.430664062 155.80859375 c 0 +904.14453125 -98.1357421875 m 1 + 720.125976562 -98.1357421875 l 1 + 720.125976562 85.939453125 l 1 + 780.458984375 85.939453125 l 1 + 780.458984375 -64.6650390625 l 1 + 904.14453125 -64.6650390625 l 1 + 904.14453125 -98.1357421875 l 1 +802.430664062 -209.9921875 m 0 + 830.4453125 -209.9921875 857.633789062 -204.500976562 883.227539062 -193.674804688 c 0 + 907.9453125 -183.221679688 930.141601562 -168.25390625 949.19921875 -149.196289062 c 0 + 968.2578125 -130.138671875 983.224609375 -107.942382812 993.678710938 -83.2236328125 c 0 + 1004.50390625 -57.6298828125 1009.99609375 -30.44140625 1009.99609375 -2.427734375 c 0 + 1009.99609375 25.5869140625 1004.50390625 52.775390625 993.678710938 78.369140625 c 0 + 983.224609375 103.087890625 968.2578125 125.284179688 949.19921875 144.341796875 c 0 + 930.141601562 163.399414062 907.9453125 178.3671875 883.227539062 188.8203125 c 0 + 857.6328125 199.646484375 830.4453125 205.137695312 802.430664062 205.137695312 c 0 + 774.416015625 205.137695312 747.227539062 199.646484375 721.633789062 188.8203125 c 0 + 696.916015625 178.3671875 674.719726562 163.399414062 655.662109375 144.341796875 c 0 + 636.603515625 125.284179688 621.63671875 103.087890625 611.182617188 78.369140625 c 0 + 600.357421875 52.775390625 594.865234375 25.5869140625 594.865234375 -2.427734375 c 0 + 594.865234375 -30.44140625 600.357421875 -57.6298828125 611.182617188 -83.2236328125 c 0 + 621.63671875 -107.942382812 636.603515625 -130.138671875 655.662109375 -149.196289062 c 0 + 674.719726562 -168.25390625 696.916015625 -183.221679688 721.633789062 -193.674804688 c 0 + 747.228515625 -204.500976562 774.411132812 -209.9921875 802.430664062 -209.9921875 c 0 +802.430664062 183.87890625 m 0 + 905.1640625 183.87890625 988.736328125 100.299804688 988.736328125 -2.427734375 c 0 + 988.736328125 -105.155273438 905.1640625 -188.733398438 802.430664062 -188.733398438 c 0 + 699.697265625 -188.733398438 616.124023438 -105.161132812 616.124023438 -2.427734375 c 0 + 616.124023438 100.305664062 699.703125 183.87890625 802.430664062 183.87890625 c 0 +EndSplineSet +Validated: 524325 +EndChar EndChars EndSplineFont diff --git a/bin/resources/fonts/promptfont.otf b/bin/resources/fonts/promptfont.otf index bd22d40440a96aeec7f2f1c8b7e4ff7146d5e009..3b5f18b95e5a5cce2874a2e254535519baa8c1c5 100644 GIT binary patch delta 6476 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 OD}K|m&s^b(iT(w99jRFW delta 2230 zcmYk7dstLu9>;&b?_n4e=72z&igFnclPwY-QSnA{N!naYF?{k8cmY%fOh~{>LyF3> zmEmBiyK3H&&2oL3kXTtYH`X;_y$0HF6SG7`K|lyp_BS*B(eupbe7^5_-}8IV`<^p1 zJ3ezg*rys}?mm{L1eKrpXjw8~wl5%)rbadQ|U1usiNhz65L|(5(Mn%(e zWNrV!+K!za9O7Lae~XBHq@A$Xkht=#Gj~2B(n!D4{*K|n~s41J6(U9IS zw*FqdrT#?yk@}tWDfP4JN7p;nD|O9vXX_T#CDzWbomM-F$kJhHu{2pMmW4z=-6yIs zn07c8zPQvnGZB)o`dP|CF5Z8ZH((?3Z2g9rL9Y_KFNIOu(F?Qe}eoIJ}yU~c(2)U9y#9s>~l4U-< z)YD&WCkSD3ezDlvmqjSb=+;jv_yFleY9AMsjZW9NEl z{8t)>gks6(#a{?tO1>aIYJ+fDe9Q*niufDB`a)e5%Sr`8wfLqDLXEiD2H_gp%bZu530(jN1dl8s>!NB%}{gHb?O)7oqyH8{HbL`>69!czBJkQVR*{h3(C9}5+d(UUzO&s_M2W{h^CLXhb$D4R^EQe3# zX?+~?kY8WLGZXoZT|B#s<9c~c5XW!jd2@J~H>d63v|F5B%9%C1`UTEv=Ijfc^BJ%8 z;wcM96w(Y_ts0r2cyuFz^lb5U_# zuDIkWZjTjDPxHQDOYIizATHGo!g2Rc-N(aw%ids=?hRJDw|}~`LeYCR&PnmHez|}D XPhWbmLU~(TI;Kh~=hC+SDFOU{{5*sp From 899c6037fecbc6668750464f39313bdc91c953fb Mon Sep 17 00:00:00 2001 From: JordanTheToaster Date: Tue, 14 Jan 2025 14:37:56 +0000 Subject: [PATCH 4/4] 3rdparty: Sync cpuinfo to commit 8a1772a0c5c447df2d18edf33ec4603a8c9c04a6 --- 3rdparty/cpuinfo/include/cpuinfo.h | 11 +++++++++++ 3rdparty/cpuinfo/src/arm/cache.c | 3 ++- 3rdparty/cpuinfo/src/arm/midr.h | 6 ++++++ 3rdparty/cpuinfo/src/x86/isa.c | 5 +++++ 3rdparty/cpuinfo/src/x86/uarch.c | 2 ++ 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/3rdparty/cpuinfo/include/cpuinfo.h b/3rdparty/cpuinfo/include/cpuinfo.h index 387611cc9bd3b..6eb4b8c38efc2 100644 --- a/3rdparty/cpuinfo/include/cpuinfo.h +++ b/3rdparty/cpuinfo/include/cpuinfo.h @@ -419,6 +419,8 @@ enum cpuinfo_uarch { cpuinfo_uarch_zen3 = 0x0020010B, /** AMD Zen 4 microarchitecture. */ cpuinfo_uarch_zen4 = 0x0020010C, + /** AMD Zen 5 microarchitecture. */ + cpuinfo_uarch_zen5 = 0x0020010D, /** NSC Geode and AMD Geode GX and LX. */ cpuinfo_uarch_geode = 0x00200200, @@ -818,6 +820,7 @@ struct cpuinfo_x86_isa { bool avx512vp2intersect; bool avx512_4vnniw; bool avx512_4fmaps; + bool avx10_1; bool amx_bf16; bool amx_tile; bool amx_int8; @@ -1433,6 +1436,14 @@ static inline bool cpuinfo_has_x86_avx_ne_convert(void) { #endif } +static inline bool cpuinfo_has_x86_avx10_1(void) { +#if CPUINFO_ARCH_X86 || CPUINFO_ARCH_X86_64 + return cpuinfo_isa.avx10_1; +#else + return false; +#endif +} + static inline bool cpuinfo_has_x86_hle(void) { #if CPUINFO_ARCH_X86 || CPUINFO_ARCH_X86_64 return cpuinfo_isa.hle; diff --git a/3rdparty/cpuinfo/src/arm/cache.c b/3rdparty/cpuinfo/src/arm/cache.c index dd19919311b15..97740c43722ff 100644 --- a/3rdparty/cpuinfo/src/arm/cache.c +++ b/3rdparty/cpuinfo/src/arm/cache.c @@ -1341,7 +1341,8 @@ void cpuinfo_arm_decode_cache( * information, please refer to the technical manuals * linked above */ - const uint32_t min_l2_size_KB = uarch == cpuinfo_uarch_neoverse_v2 ? 1024 : 256; + const uint32_t min_l2_size_KB = + (uarch == cpuinfo_uarch_neoverse_v2 || midr_is_ampere_altra(midr)) ? 1024 : 256; const uint32_t min_l3_size_KB = 0; *l1i = (struct cpuinfo_cache){ diff --git a/3rdparty/cpuinfo/src/arm/midr.h b/3rdparty/cpuinfo/src/arm/midr.h index 89ebbb5836809..5530d5a9960e9 100644 --- a/3rdparty/cpuinfo/src/arm/midr.h +++ b/3rdparty/cpuinfo/src/arm/midr.h @@ -34,6 +34,7 @@ #define CPUINFO_ARM_MIDR_KRYO_SILVER_820 UINT32_C(0x510F2110) #define CPUINFO_ARM_MIDR_EXYNOS_M1_M2 UINT32_C(0x530F0010) #define CPUINFO_ARM_MIDR_DENVER2 UINT32_C(0x4E0F0030) +#define CPUINFO_ARM_MIDR_AMPERE_ALTRA UINT32_C(0x413fd0c1) inline static uint32_t midr_set_implementer(uint32_t midr, uint32_t implementer) { return (midr & ~CPUINFO_ARM_MIDR_IMPLEMENTER_MASK) | @@ -167,6 +168,11 @@ inline static bool midr_is_kryo_gold(uint32_t midr) { return (midr & uarch_mask) == (CPUINFO_ARM_MIDR_KRYO_GOLD & uarch_mask); } +inline static bool midr_is_ampere_altra(uint32_t midr) { + const uint32_t uarch_mask = CPUINFO_ARM_MIDR_IMPLEMENTER_MASK | CPUINFO_ARM_MIDR_PART_MASK; + return (midr & uarch_mask) == (CPUINFO_ARM_MIDR_AMPERE_ALTRA & uarch_mask); +} + inline static uint32_t midr_score_core(uint32_t midr) { const uint32_t core_mask = CPUINFO_ARM_MIDR_IMPLEMENTER_MASK | CPUINFO_ARM_MIDR_PART_MASK; switch (midr & core_mask) { diff --git a/3rdparty/cpuinfo/src/x86/isa.c b/3rdparty/cpuinfo/src/x86/isa.c index bfd5e776b185c..47a6afa320968 100644 --- a/3rdparty/cpuinfo/src/x86/isa.c +++ b/3rdparty/cpuinfo/src/x86/isa.c @@ -429,6 +429,11 @@ struct cpuinfo_x86_isa cpuinfo_x86_detect_isa( */ isa.avx512f = avx512_regs && !!(structured_feature_info0.ebx & UINT32_C(0x00010000)); + /* + * AVX 10.1 instructions: + */ + isa.avx10_1 = avx512_regs && !!(structured_feature_info1.edx & UINT32_C(0x00080000)); + /* * AVX512PF instructions: * - Intel: ebx[bit 26] in structured feature info (ecx = 0). diff --git a/3rdparty/cpuinfo/src/x86/uarch.c b/3rdparty/cpuinfo/src/x86/uarch.c index b291ebcf0cec3..a21eabb0a0ab1 100644 --- a/3rdparty/cpuinfo/src/x86/uarch.c +++ b/3rdparty/cpuinfo/src/x86/uarch.c @@ -387,6 +387,8 @@ enum cpuinfo_uarch cpuinfo_x86_decode_uarch( return cpuinfo_uarch_zen4; } break; + case 0x1a: + return cpuinfo_uarch_zen5; } break; case cpuinfo_vendor_hygon: