mirror of
https://github.com/seekrs/MacroLibX.git
synced 2026-06-03 15:18:15 +02:00
Compare commits
739 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
b090a070c8
|
|||
| 069f8af9d6 | |||
| 8b952f14c5 | |||
| cfc3fccac4 | |||
| f691ce6890 | |||
| fb0eecde00 | |||
| f65b8a2aef | |||
|
552cc33ba3
|
|||
| d1f5b7c68e | |||
| e3ab91c7eb | |||
| 6f0beebdf9 | |||
| f9f4fc6425 | |||
| 59b3a297f9 | |||
| 790e24ebdb | |||
| 3a2563a7f5 | |||
| cf491fc56d | |||
| 492365f6dd | |||
| 564942ad35 | |||
| 2751206578 | |||
| 002c35ccdb | |||
| 36e63bbbe7 | |||
| 3a11c1d350 | |||
| 74613d230f | |||
| f1e89ca90e | |||
| 1566fbfc00 | |||
| 6c1400e62c | |||
| 25fb5285f7 | |||
| 87059f8ca3 | |||
| db299c6930 | |||
| ebfc00d015 | |||
|
7639c27df4
|
|||
| 2d9f193a72 | |||
| 6aac4a71de | |||
| 0ff3085448 | |||
| b286da89e2 | |||
|
55eb31551a
|
|||
|
7741ed2dd4
|
|||
| b09f5c39f7 | |||
| 91b93a6f10 | |||
| 26c47c3a95 | |||
| 28142f764f | |||
| 26ccd5eeee | |||
| 849ecbaf1f | |||
| b345fbc672 | |||
| bb019f20a7 | |||
|
33ae4c3a37
|
|||
| 32987f0afe | |||
| 3e82487037 | |||
| b33154d846 | |||
|
278e29d277
|
|||
| 8ccfa0bee1 | |||
| b0806958fe | |||
| 7e31195b77 | |||
| 5912aa5c12 | |||
| e3ee9f0327 | |||
| 807931fc8b | |||
| 768dc0c1d9 | |||
| 55086a05a6 | |||
| bef1888a79 | |||
|
519b273a20
|
|||
|
fd8beaaf17
|
|||
| c4979ceded | |||
| f4a1dc386a | |||
| 83d05cc6e2 | |||
| f44c4d106c | |||
|
6fd5814032
|
|||
|
7a3a65d26c
|
|||
| c251fb81e3 | |||
| cf84449dee | |||
| 58f1e76a56 | |||
| b6c7e8095f | |||
| a6a3178425 | |||
| 8c43af3ad1 | |||
| 1f96fa56d8 | |||
|
4f0d8dac67
|
|||
| 85150693af | |||
| 56fa5ac613 | |||
| 19f5a2eb2f | |||
| cb2979108b | |||
| 454fcc6e65 | |||
| a51d391a04 | |||
| 9ae3f46f2e | |||
| 4adaccf72a | |||
| 67523e7fb4 | |||
| ec019ba45c | |||
| ba0398092a | |||
| b89bacfa95 | |||
| f84e0b2312 | |||
| 65ff11b301 | |||
| 1f780e2a8a | |||
| 06ddcf99d7 | |||
| ece1fc93da | |||
| 04bc524ae8 | |||
| b63f07bfe8 | |||
| a40907b68f | |||
| 9ec992d54c | |||
| a665f7c448 | |||
| cee944d996 | |||
| 493696482c | |||
| 9c4aaea79f | |||
| ffc0f26701 | |||
| 1835db0943 | |||
| 7c35354c44 | |||
| c99cf63194 | |||
| c5026d93dc | |||
| 22fb83fee1 | |||
| c62168b0e2 | |||
| 31cbdec371 | |||
| cbf185e6c5 | |||
| e5b555dbc3 | |||
| 15f2649562 | |||
| a28e17aa31 | |||
| c0095314fd | |||
| 4529ba5752 | |||
| d127e6c3f9 | |||
| a9f5be910f | |||
| 4f1cad4e72 | |||
| 9573199ad9 | |||
| 72e158a0a7 | |||
| 72d8ddae64 | |||
| 93014c1668 | |||
| 19758b6d40 | |||
| 5c385675c7 | |||
| ab9d12ae17 | |||
| 18b57e3761 | |||
| bb67bd42e1 | |||
| 0894cb5d4f | |||
| e45ded6ea9 | |||
| 93d0b1828b | |||
| d2057e3108 | |||
| e7baccb6cc | |||
| 41cae01a9b | |||
| 008dc4132c | |||
| 3e29dd1bbe | |||
| 9f795fa67e | |||
| 4e88505aa6 | |||
| 324ef540fd | |||
| 741fa6cf89 | |||
| 22e7d90285 | |||
| f17a1b24e3 | |||
| 85c3c844ea | |||
| 14dee628c4 | |||
| e66c5482ea | |||
| c474648da0 | |||
| c94513107b | |||
| ed794863d9 | |||
| c7fba85393 | |||
| 5650662d07 | |||
| 640554981c | |||
| a9274fcb3e | |||
| 3d6314253a | |||
| 1a77df23ee | |||
| c16c4dc301 | |||
| 7354a5ade4 | |||
| 6c22b3e830 | |||
| 0fdc36a6b7 | |||
| d2513834a2 | |||
| ba5ef31796 | |||
| 29826e70ab | |||
| 31d2054389 | |||
| 24c3faa88f | |||
| 44f2bbf6cd | |||
| 3e079cc0e9 | |||
| 025db7c2c8 | |||
| 0628afa905 | |||
| b05fb59e37 | |||
| 2c73362fce | |||
| f47db635e2 | |||
| c72d44a8ea | |||
| 70d2426ed4 | |||
| e89fe88d83 | |||
| 19dbd4e203 | |||
| 093dabcbbb | |||
| 096c0ae8cb | |||
| ff76134422 | |||
| 2345cf4417 | |||
| 4bd35e72fd | |||
| 2798a43674 | |||
| 0c11d7a815 | |||
| ad4891f1f5 | |||
| e7d575046a | |||
| f478bb4a9e | |||
| 42e7e409db | |||
| 357c813b85 | |||
| daade1efc0 | |||
| 90a8dad18c | |||
| fbc5bf0e45 | |||
| 43a727edf4 | |||
| 6a959d8469 | |||
| cadf1669c8 | |||
| 0b99c62bbf | |||
| 0201d933fd | |||
| 8a91d90b0d | |||
| 0982ed814d | |||
| c5b1a80bd9 | |||
| 3f5b42d301 | |||
| 69502db0ee | |||
| c50925c64d | |||
| 7e0664a28f | |||
| fdaaa86b7f | |||
| 3f8955f4b1 | |||
| baec65134c | |||
| 4462400b73 | |||
| 9b0c3500c7 | |||
| 157e555fb6 | |||
| 2ae59b1b39 | |||
| 2c710058f3 | |||
| d64be4a1f5 | |||
| 8c2e0cc69e | |||
| 82dc92047f | |||
| 3654cc67b1 | |||
| e46c2b99ec | |||
| 2fdd9246db | |||
| e6fb5a72d2 | |||
| bc3d732208 | |||
| 23fc64a679 | |||
| 8bbe66528e | |||
| f4422c3174 | |||
| 86709573fe | |||
| c8250629f3 | |||
| ef16cd3fdb | |||
| 12c7469f52 | |||
| 9443555cbb | |||
| 023215aeed | |||
| bb523e8f66 | |||
| 48da7003c9 | |||
| 2137fc4ee7 | |||
| 0f0ca48339 | |||
| deb6c20361 | |||
| b432e3e2e1 | |||
| 1f482719e6 | |||
| 3683a48e17 | |||
| 94b46ac18c | |||
| 6d34a7ffa6 | |||
| f4c186e724 | |||
| ce530c765e | |||
| d1d7f7ed98 | |||
| 49002fdd98 | |||
| 45220a35fb | |||
| 5244cde0ae | |||
| 4e326db10d | |||
| 952e48a05c | |||
| 62bd63c364 | |||
| 30f4602b1c | |||
| 393735b1d6 | |||
| d40264891c | |||
| 6604cd647d | |||
| f64ce376d6 | |||
| c636229875 | |||
| a85ad6378e | |||
| 5a93cd4ae5 | |||
| 4efe213fc6 | |||
| 8721fe5000 | |||
| a90bb88169 | |||
| 35b47936b4 | |||
| 69bbed5b54 | |||
| 024a9af55a | |||
| 623021a669 | |||
| feb3fcbd1f | |||
| 5b726fe74a | |||
| 5a36b90a72 | |||
| e365c8a48c | |||
| 7bd2b9c4c7 | |||
| f78c3e9f0f | |||
| 34ea0822a7 | |||
| f5ffd97e48 | |||
| 6f57d9dab7 | |||
| 65fd92dca9 | |||
| 999ef64d0a | |||
| 33260f316f | |||
| 3122576f04 | |||
| 92d060fc70 | |||
| 57a7b10850 | |||
| 777b92af8c | |||
| b7183a1058 | |||
| e425b66591 | |||
| 8db78fc86b | |||
| 122f4e8403 | |||
| 843856d004 | |||
| afc17be8e4 | |||
| 0b492d5d47 | |||
| 8c63e316ef | |||
| 375fa0f49e | |||
| 32b6053cfb | |||
| ef50272a0c | |||
| c6aaa4e2fa | |||
| e29ea92202 | |||
| eaf5be3061 | |||
| 4ae7bd0420 | |||
| 5f46c8cb55 | |||
| e8de2c169d | |||
| bccfb8cd90 | |||
| f3efdd8d72 | |||
| b59888efb3 | |||
| a662427097 | |||
| 6669d78323 | |||
| de30c11157 | |||
| 5cf965b9a1 | |||
| 2854b19296 | |||
| d167538b3f | |||
| 9dfe72f27c | |||
| 00fccf011e | |||
| a1bc4a801d | |||
| 8c287e4cbc | |||
| fed7111362 | |||
| dbf4d3cc5b | |||
| 9499ade4c0 | |||
| e470e4c43c | |||
| 028cb57ff4 | |||
| 625e23e624 | |||
| 7114522d80 | |||
| 1c073eb8eb | |||
| 3aaa5df929 | |||
| 3828b98a60 | |||
| da41f2836f | |||
| 2dadf5d29a | |||
| 1ec2f72d26 | |||
| b0384830a9 | |||
| e1fefba841 | |||
| 58ad52e1cc | |||
| a86f26f0f3 | |||
| 92743b0b03 | |||
| 3291e0cd2a | |||
| 7a3e5f37fa | |||
| 0304834008 | |||
| 049eb3e33c | |||
| 66024349cb | |||
| e1af24a3ef | |||
| 40b82243ba | |||
| ecb0a15e74 | |||
| 12b832ee31 | |||
| 4f755f8a6f | |||
| a905f571dc | |||
| 386d9abe4b | |||
| d0a74e79c5 | |||
| 160364bda2 | |||
| ec2f1101f0 | |||
| 568b5a85ce | |||
| f2cbd6679d | |||
| 2e93798948 | |||
| d4ea03e047 | |||
| 5866f5ac25 | |||
| 53650f3153 | |||
| cc8fb1bbb3 | |||
| a3334277c6 | |||
| a593838c4d | |||
| b4e61e1875 | |||
| ef72083bd0 | |||
| b0924861aa | |||
| 99437a6d6a | |||
| ad35eee0b6 | |||
| 904b6d31ac | |||
| 2e08c37624 | |||
| f9c05d6d7b | |||
| 1e2705ef06 | |||
| 8348f9ce7a | |||
| 092e5acd9b | |||
| f4e4672cc6 | |||
| fcb2d1d9bc | |||
| a4b14baddd | |||
| 596393ed20 | |||
| 2b9b026d68 | |||
| 4c17f2e165 | |||
| 91b51a5621 | |||
| 976afdac3d | |||
| 429bd9eabd | |||
| 30e07d1f1a | |||
| 48d09e40d5 | |||
| 7f2d60f21d | |||
| a4801fbce8 | |||
| 760317dcc7 | |||
| 520ce8d61e | |||
| cd29248fc6 | |||
| 7db31b13c2 | |||
| 4f6886517e | |||
| d87d4fbd6a | |||
| aa09d9d83f | |||
| 34b4d2bda0 | |||
| 8888bd03d8 | |||
| 8ad6d84bd2 | |||
| e0da415e86 | |||
| a455d7704d | |||
| f65ac577bc | |||
| 06372a84ed | |||
| 1dae0931f7 | |||
| 3d8ab31abb | |||
| 5dcb7402e1 | |||
| 8b9ef40f99 | |||
| 1fe21e7725 | |||
| bea16a2dc1 | |||
| 1ddad73356 | |||
| 538cd96eda | |||
| 3668515e9b | |||
| d95233e728 | |||
| d209747978 | |||
| 00c87a61a3 | |||
| e930b3b0be | |||
| 0795200910 | |||
| dd36a878cd | |||
| 470f3a3a3c | |||
| 3a3b4e063a | |||
| eb158d01c7 | |||
| 905ab698cb | |||
| d535faaaf7 | |||
| c427c46e24 | |||
| e32c65d918 | |||
| 81387ec53d | |||
| 850b47f6cf | |||
| 1641a48e4e | |||
| 9ef9cd897d | |||
| b93d0753c6 | |||
| 710634ced6 | |||
| d616adb466 | |||
| e7eb894335 | |||
| afee09d1ea | |||
| 1d9a51e4f7 | |||
| 10f1b865bd | |||
| 920e0f5e66 | |||
| ace4c98945 | |||
| a7aa05fcbe | |||
| 7f7b6704ce | |||
| 291927a1cc | |||
| 280e3b43d3 | |||
| 969555d572 | |||
| a69ea93597 | |||
| 610603e87c | |||
| 58c082f033 | |||
| e09797a1a6 | |||
| 2c01c67361 | |||
| 7271b8fc9a | |||
| 67d7635a32 | |||
| 215a0dc2c3 | |||
| 39d38c822b | |||
| 6bbf1e196d | |||
| e5ff232065 | |||
| 4af38a2c7e | |||
| 2200863406 | |||
| d9a00dee22 | |||
| f7946eea68 | |||
| c26c6f952b | |||
| 54435be20d | |||
| be2a7d5157 | |||
| 7011a6ee6e | |||
| 235292b440 | |||
| d9e88f70c7 | |||
| e8c80eccab | |||
| fa7f16744d | |||
| 105b32b710 | |||
| 75bca5bf6f | |||
| c5a5a029af | |||
| 6000b3e3c1 | |||
| 7b64359f3e | |||
| 3624caf519 | |||
| 828024e131 | |||
| 784156c395 | |||
| b53b36e07a | |||
| 3bb167e164 | |||
| fe9dd3c9df | |||
| 132e539d4a | |||
| 916b0fbcb5 | |||
| ea4793c403 | |||
| 7b9ee3d49f | |||
| 599f9414ae | |||
| d6e4ef1976 | |||
| 9c0e7dfd21 | |||
| 1dd24f687c | |||
| 1e2f2880ae | |||
| eaf2d00864 | |||
| 528867bc7b | |||
| fab193db38 | |||
| 3f4dcad12f | |||
| a461624fea | |||
| 77ab3bf68c | |||
| 982b8c17f4 | |||
| d857d598e8 | |||
| a3af54f271 | |||
| 48133e3432 | |||
| 6143e8b1c5 | |||
| dd0599c088 | |||
| 208b0e4710 | |||
| 209472d0a1 | |||
| 708e509bfa | |||
| 47aead9e2d | |||
| 9024b9cc12 | |||
| 0bd6f17260 | |||
| a0d5cea21f | |||
| 2c9c4217ec | |||
| 39298eda36 | |||
| 99e6267489 | |||
| 4835ff0337 | |||
| 7f1dd999bf | |||
| 088e1891fc | |||
| 18d0f102ec | |||
| e060cf39f9 | |||
| 7de0758f76 | |||
| 189764dc34 | |||
| 875d73e3dd | |||
| 62c623d70a | |||
| 05ba165c45 | |||
| 944038e564 | |||
| fb6bda24a6 | |||
| c3ffb80a10 | |||
| 0acb086819 | |||
| b14468eed1 | |||
| f9d1234642 | |||
| 44d76a3b9e | |||
| aa97d048b8 | |||
| 887e2b8699 | |||
| c64cb4ac67 | |||
| c88d9f1d9d | |||
| 15b54a15c8 | |||
| 348dff8140 | |||
| 6e4322e1ba | |||
| a9cd7375f6 | |||
| 6d053a6941 | |||
| 02819d281e | |||
| c24d961211 | |||
| b3ba952218 | |||
| c8382eddbf | |||
| 7c8f233cc8 | |||
| 84ded2734d | |||
| c4cb077043 | |||
| 09829ed104 | |||
| 988ccf32db | |||
| 4ab70c2c35 | |||
| ae6c4710c8 | |||
| 1a19c55568 | |||
| 1ef45ebba2 | |||
| 0cba8d011e | |||
| 79436b7068 | |||
| e15aa45627 | |||
| 0beb25ce92 | |||
| 86714c3dd4 | |||
| 3aa5c20dbc | |||
| a1e5eb9254 | |||
| 60bacab2e4 | |||
| 19a895c5f4 | |||
| bd0a111e5f | |||
| cbed1b7653 | |||
| 5f33613583 | |||
| 198600b853 | |||
| 32b5338187 | |||
| d5e1e36a5d | |||
| 2bc0b94626 | |||
| 46ec35cfd7 | |||
| 9103138ee5 | |||
| f502c86400 | |||
| d38fd8eeb1 | |||
| 16424cc2e3 | |||
| a2a1339736 | |||
| 8fa6fd35d0 | |||
| 23333da539 | |||
| 939b224b64 | |||
| e245c27867 | |||
| d172ea89fc | |||
| 075a8718de | |||
| 5f04c34aa0 | |||
| 8774d4c3fb | |||
| a2f9594811 | |||
| ac3b28c922 | |||
| b144afd3fe | |||
| c88ff1525d | |||
| 522975bf8b | |||
| 8b9d23a17a | |||
| 252f9c3da0 | |||
| 74b30ea218 | |||
| ca13d77996 | |||
| 5d80fd87f4 | |||
| 9f555316fc | |||
| b384ebec1b | |||
| 899ad8de70 | |||
| d25cfc5975 | |||
| 66359574f9 | |||
| 6f0f944fbe | |||
| 72cc2eb9ab | |||
| 73c8e331af | |||
| 719dfea21c | |||
| 4a6a525847 | |||
| eb7330a943 | |||
| 2d89f41639 | |||
| a86eab4386 | |||
| e2ee1f2820 | |||
| 280c1c076f | |||
| c7e59cbbeb | |||
| 8b2d9d15bd | |||
| c2258115d7 | |||
| 7d7ed1caba | |||
| 6435cc8333 | |||
| a0a764d6a2 | |||
| 74f2306e6c | |||
| c0e2750fb3 | |||
| 5093e7d1eb | |||
| db86779907 | |||
| a387e34d3c | |||
| f9d729d30b | |||
| fc3382f984 | |||
| 7dda5d5624 | |||
| 44d7c7e4fd | |||
| 99678c2bb3 | |||
| bcfd5ef454 | |||
| d2fb0e0e83 | |||
| 56c11352bc | |||
| e297b8a05a | |||
| b9e0540a1b | |||
| f34161fa81 | |||
| 3ab024cced | |||
| 4d6c970a71 | |||
| e8f4056b81 | |||
| 5d52517d37 | |||
| 0a7a082d24 | |||
| 5c497e4175 | |||
| 6b54089066 | |||
| 5f6a28f4f8 | |||
| 49f6bb4b71 | |||
| 1105bc6646 | |||
| 36bd11fdf5 | |||
| a5e4b41ceb | |||
| a260be573a | |||
| 327374d53b | |||
| 57da195bf9 | |||
| d9de06a000 | |||
| 0a4bd42869 | |||
| fc3f72ee3e | |||
| d5e263390e | |||
| a437316723 | |||
| 555af79e9e | |||
| 038a6db77f | |||
| b078165849 | |||
| 591c144104 | |||
| 0b6b0b4902 | |||
| 51bd482acc | |||
| a68f8ede72 | |||
| f844c3ad58 | |||
| b84350f76d | |||
| 9d89019af3 | |||
| ce2966e1b5 | |||
| 5184e9500d | |||
| bfcc8cb758 | |||
| 854a074cac | |||
| 53c0f08bc1 | |||
| 683ef90ddb | |||
| 6c0c4c127a | |||
| e1b3f4d995 | |||
| df7aeb11bb | |||
| f634b14998 | |||
| 1407e6217c | |||
| f0676c950d | |||
| 05f6a810bf | |||
| 7dc5701eff | |||
| db91730e13 | |||
| df29e41ac5 | |||
| a158aa2269 | |||
| d5a8b96be8 | |||
| 9f869d93e2 | |||
| 20068b0ff3 | |||
| d28b41dab5 | |||
| 5e63cd8959 | |||
| 6b970e988a | |||
| 8954e4e189 | |||
| 19ccc1230e | |||
| 519691a944 | |||
| e4df341a66 | |||
| d1613ddfdb | |||
| e471585946 | |||
| 6a2a3739c7 | |||
| 6c3db4a8db | |||
| 02d2dbb1bd | |||
| 942deade55 | |||
| b75f543977 | |||
| ea6c2a3335 | |||
| 22c9e14947 | |||
| 9c54cb6c68 | |||
| 6acd433437 | |||
| 4e5fb2648a | |||
| be8caa922c | |||
| 735f748b79 | |||
| 5108134a5f | |||
| 9dfd3ab971 | |||
| 0134e4e55d | |||
| 5d4ab828ed | |||
| 7f393fdcd5 | |||
| 3c0abd6fe0 | |||
| ded90b50bf | |||
| 9677be6d9e | |||
| a4cf2ee80f | |||
| 2951253b15 | |||
| e8ab351963 | |||
| 1242eac872 | |||
| 6f25472e6b | |||
| de9250dd42 | |||
| 8fee417803 | |||
| 426da22b52 | |||
| b0968adf1c | |||
| 7f7d197e42 | |||
| d90ab27489 | |||
| d2b8834675 | |||
| 4e4103f86b | |||
| 26037936e8 | |||
| bc84808333 | |||
| 4e1832e59d | |||
| a70bec4740 | |||
| f6fcb214e5 | |||
| 6a8d55dbe8 | |||
| cb4e9dbe8d | |||
| 6d3421d7f4 | |||
| f6736f210a | |||
| e7d65a297e | |||
| c497645ee9 | |||
| 4fa9873f44 | |||
| fe45d0953d | |||
| ec0f2eaa60 | |||
| 06a95fae73 | |||
| 098622c6b9 | |||
| 599f1007ab | |||
| 157a099ed2 | |||
| 77e8672754 | |||
| 10ff1acd89 | |||
| bada255057 | |||
| b03bd6fe0a | |||
| fbe97415cf | |||
| 27000b6163 | |||
| c85c12bfaf | |||
| d02f04c294 | |||
| 21962dda90 | |||
| aaf7e861d5 | |||
| 7eea6ea1d5 | |||
| 28850a6cb8 | |||
| 2ab87dd3ad | |||
| 88404afb2b | |||
| 3b29305936 | |||
| 8ca0b041e3 | |||
| e74d218d6e | |||
| b66476ef4f | |||
| 006d665ce2 | |||
| c8302b4fdf | |||
| 2c6c3a945e | |||
| c907c52968 | |||
| b275918de6 | |||
| 3ee3a5899b |
@@ -7,5 +7,6 @@ version: 2
|
|||||||
updates:
|
updates:
|
||||||
- package-ecosystem: "github-actions" # See documentation for possible values
|
- package-ecosystem: "github-actions" # See documentation for possible values
|
||||||
directory: "/" # Location of package manifests
|
directory: "/" # Location of package manifests
|
||||||
|
target-branch: "indev"
|
||||||
schedule:
|
schedule:
|
||||||
interval: "weekly"
|
interval: "weekly"
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
name: Fetch Dependencies
|
name: Fetch Dependencies
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '0 0 * * 0' # Runs weekly
|
- cron: '0 0 * * 0' # Runs weekly
|
||||||
|
|
||||||
@@ -10,20 +11,24 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Run Fetch Dependencies Script
|
- name: Run Fetch Dependencies Script
|
||||||
run: cd scripts && bash ./fetch_dependencies.sh
|
run: cd scripts && bash ./fetch_dependencies.sh
|
||||||
|
|
||||||
- name: Create Pull Request
|
- name: Create Pull Request
|
||||||
uses: peter-evans/create-pull-request@v6
|
uses: peter-evans/create-pull-request@v8
|
||||||
with:
|
with:
|
||||||
|
token: ${{ secrets.REPO_SCOPED_TOKEN }}
|
||||||
|
delete-branch: true
|
||||||
title: update dependencies
|
title: update dependencies
|
||||||
commit-message: "[BOT] update dependencies"
|
commit-message: "[BOT] update dependencies"
|
||||||
committer: GitHub <noreply@github.com>
|
committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
||||||
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
|
author: kbJeff-8 <kbJeff-8@users.noreply.github.com>
|
||||||
signoff: false
|
signoff: false
|
||||||
base: indev
|
base: indev
|
||||||
|
assignees: Kbz-8
|
||||||
|
reviewers: Kbz-8
|
||||||
branch: auto_deps_updates
|
branch: auto_deps_updates
|
||||||
labels: |
|
labels: |
|
||||||
automated
|
automated
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ jobs:
|
|||||||
issues: write
|
issues: write
|
||||||
pull-requests: write
|
pull-requests: write
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/first-interaction@v1
|
- uses: actions/first-interaction@v2
|
||||||
with:
|
with:
|
||||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
issue-message: |
|
issue-message: |
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
name: Linux (clang)
|
name: Linux (clang)
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
repository_dispatch:
|
||||||
|
types: [create-pull-request]
|
||||||
pull_request:
|
pull_request:
|
||||||
push:
|
push:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
@@ -21,7 +23,7 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Install system dependencies
|
- name: Install system dependencies
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
name: Linux (gcc)
|
name: Linux (gcc)
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
repository_dispatch:
|
||||||
|
types: [create-pull-request]
|
||||||
pull_request:
|
pull_request:
|
||||||
push:
|
push:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
@@ -21,7 +23,7 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Install system dependencies
|
- name: Install system dependencies
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
name: Linux (meson)
|
||||||
|
|
||||||
|
on:
|
||||||
|
repository_dispatch:
|
||||||
|
types: [create-pull-request]
|
||||||
|
pull_request:
|
||||||
|
push:
|
||||||
|
paths-ignore:
|
||||||
|
- '.gitignore'
|
||||||
|
- 'LICENSE'
|
||||||
|
- 'README.md'
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
os: [ubuntu-24.04]
|
||||||
|
arch: [x86_64]
|
||||||
|
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
if: "!contains(github.event.head_commit.message, 'ci skip')"
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Install system dependencies
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get -y install mesa-common-dev clang libsdl2-2.0-0 libsdl2-dev build-essential libvulkan-dev
|
||||||
|
|
||||||
|
- name: Python
|
||||||
|
uses: actions/setup-python@v6
|
||||||
|
with:
|
||||||
|
python-version: '3.11'
|
||||||
|
|
||||||
|
- name: Install Meson with pip
|
||||||
|
run: sudo pip3 install meson
|
||||||
|
|
||||||
|
- name: Build with meson
|
||||||
|
run: |
|
||||||
|
meson build --prefix=$PWD/ --bindir='' --libdir=''
|
||||||
|
ninja install -C build
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
name: macOS
|
name: macOS
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
repository_dispatch:
|
||||||
|
types: [create-pull-request]
|
||||||
pull_request:
|
pull_request:
|
||||||
push:
|
push:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
@@ -14,14 +16,14 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [macOS-latest]
|
os: [macOS-latest]
|
||||||
arch: [x86_64]
|
arch: [x86_64, arm]
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
if: "!contains(github.event.head_commit.message, 'ci skip')"
|
if: "!contains(github.event.head_commit.message, 'ci skip')"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
# Install system dependencies
|
# Install system dependencies
|
||||||
- name: Install Dependancies
|
- name: Install Dependancies
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
name: macOS (meson)
|
||||||
|
|
||||||
|
on:
|
||||||
|
repository_dispatch:
|
||||||
|
types: [create-pull-request]
|
||||||
|
pull_request:
|
||||||
|
push:
|
||||||
|
paths-ignore:
|
||||||
|
- '.gitignore'
|
||||||
|
- 'LICENSE'
|
||||||
|
- 'README.md'
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
os: [macOS-latest]
|
||||||
|
arch: [x86_64, arm]
|
||||||
|
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
if: "!contains(github.event.head_commit.message, 'ci skip')"
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Install system dependencies
|
||||||
|
run: |
|
||||||
|
brew install SDL2
|
||||||
|
|
||||||
|
- name: Python
|
||||||
|
uses: actions/setup-python@v6
|
||||||
|
with:
|
||||||
|
python-version: '3.11'
|
||||||
|
|
||||||
|
- name: Install Meson with pip
|
||||||
|
run: sudo pip3 install meson
|
||||||
|
|
||||||
|
- name: Build with meson
|
||||||
|
run: |
|
||||||
|
meson build --prefix=$PWD/ --bindir='' --libdir=''
|
||||||
|
ninja install -C build
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
name: Unit tests
|
name: Unit tests
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
repository_dispatch:
|
||||||
|
types: [create-pull-request]
|
||||||
pull_request:
|
pull_request:
|
||||||
push:
|
push:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
@@ -21,9 +23,9 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
- uses: NcStudios/VulkanCI@v1.0
|
- uses: NcStudios/VulkanCI@v1.2
|
||||||
|
|
||||||
- name: Install system dependencies
|
- name: Install system dependencies
|
||||||
run: |
|
run: |
|
||||||
@@ -67,7 +69,7 @@ jobs:
|
|||||||
# Save dependencies
|
# Save dependencies
|
||||||
- name: Save cached xmake dependencies
|
- name: Save cached xmake dependencies
|
||||||
if: ${{ !steps.restore-depcache.outputs.cache-hit }}
|
if: ${{ !steps.restore-depcache.outputs.cache-hit }}
|
||||||
uses: actions/cache/save@v4
|
uses: actions/cache/save@v5
|
||||||
with:
|
with:
|
||||||
path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
|
path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
|
||||||
key: ${{ steps.restore-depcache.outputs.cache-primary-key }}
|
key: ${{ steps.restore-depcache.outputs.cache-primary-key }}
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
name: Windows (xmake)
|
name: Windows (xmake)
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
repository_dispatch:
|
||||||
|
types: [create-pull-request]
|
||||||
pull_request:
|
pull_request:
|
||||||
push:
|
push:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
@@ -14,7 +16,7 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [windows-latest]
|
os: [windows-latest]
|
||||||
arch: [x64]
|
arch: [x64, x86]
|
||||||
mode: [release]
|
mode: [release]
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
@@ -26,7 +28,7 @@ jobs:
|
|||||||
run: echo "key=$(date +'%W')" >> $GITHUB_OUTPUT
|
run: echo "key=$(date +'%W')" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
# Force xmake to a specific folder (for cache)
|
# Force xmake to a specific folder (for cache)
|
||||||
- name: Set xmake env
|
- name: Set xmake env
|
||||||
|
|||||||
@@ -0,0 +1,109 @@
|
|||||||
|
name : Windows (Meson)
|
||||||
|
|
||||||
|
on:
|
||||||
|
repository_dispatch:
|
||||||
|
types: [create-pull-request]
|
||||||
|
pull_request:
|
||||||
|
push:
|
||||||
|
paths-ignore:
|
||||||
|
- '.gitignore'
|
||||||
|
- 'LICENSE'
|
||||||
|
- 'README.md'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
VisualStudio:
|
||||||
|
if: "!contains(github.event.head_commit.message, 'ci skip')"
|
||||||
|
runs-on: windows-latest
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
platform: ['x64', 'x86']
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
# Install a 32-bit Python so building related stuff work.
|
||||||
|
- name: Setup x86 Python
|
||||||
|
if: matrix.platform == 'x86'
|
||||||
|
uses: actions/setup-python@v6
|
||||||
|
with:
|
||||||
|
architecture: 'x86'
|
||||||
|
python-version: '3.12'
|
||||||
|
|
||||||
|
- name: Install Meson & Ninja
|
||||||
|
run: |
|
||||||
|
python -m pip install meson ninja
|
||||||
|
- uses: ilammy/msvc-dev-cmd@v1
|
||||||
|
with:
|
||||||
|
arch: ${{matrix.platform}}
|
||||||
|
|
||||||
|
- name: Compile mlx
|
||||||
|
run: |
|
||||||
|
meson setup builddir
|
||||||
|
meson compile -C builddir
|
||||||
|
|
||||||
|
VisualStudio-clang-cl:
|
||||||
|
if: "!contains(github.event.head_commit.message, 'ci skip')"
|
||||||
|
runs-on: windows-latest
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
env:
|
||||||
|
CC: clang-cl
|
||||||
|
CXX: clang-cl
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Install Meson & Ninja
|
||||||
|
run: |
|
||||||
|
python -m pip install meson ninja
|
||||||
|
|
||||||
|
- uses: ilammy/msvc-dev-cmd@v1
|
||||||
|
|
||||||
|
- name: Compile mlx
|
||||||
|
run: |
|
||||||
|
meson setup builddir
|
||||||
|
meson compile -C builddir
|
||||||
|
|
||||||
|
MSYS2:
|
||||||
|
if: "!contains(github.event.head_commit.message, 'ci skip')"
|
||||||
|
runs-on: windows-latest
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
platform: ['UCRT64', 'CLANG64']
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- uses: msys2/setup-msys2@v2
|
||||||
|
with:
|
||||||
|
msystem: ${{matrix.platform}}
|
||||||
|
install: >-
|
||||||
|
bison
|
||||||
|
dos2unix
|
||||||
|
flex
|
||||||
|
git
|
||||||
|
pacboy: >-
|
||||||
|
cc:p
|
||||||
|
cmake:p
|
||||||
|
ninja:p
|
||||||
|
pkgconf:p
|
||||||
|
python-certifi:p
|
||||||
|
python-pip:p
|
||||||
|
# Make sure Python is updated to >=3.11 (fix https://github.com/msys2/MINGW-packages/issues/17415).
|
||||||
|
update: true
|
||||||
|
|
||||||
|
- name: Install Meson
|
||||||
|
shell: msys2 {0}
|
||||||
|
run: |
|
||||||
|
python -m pip install meson
|
||||||
|
|
||||||
|
- name: Compile mlx
|
||||||
|
shell: msys2 {0}
|
||||||
|
run: |
|
||||||
|
meson setup builddir
|
||||||
|
meson compile -C builddir
|
||||||
+2
-2
@@ -23,5 +23,5 @@
|
|||||||
objs/
|
objs/
|
||||||
build/
|
build/
|
||||||
example/Test
|
example/Test
|
||||||
macrolibpy/__pycache__
|
subprojects/*/
|
||||||
example/__pycache__
|
subprojects/.wraplock
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
MIT License
|
MIT License
|
||||||
Copyright (c) 2022-2024 kbz_8
|
Copyright (c) 2022-2026 kbz_8
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
|||||||
@@ -4,8 +4,6 @@ MAKE = make --no-print-directory
|
|||||||
OS ?= $(shell uname -s)
|
OS ?= $(shell uname -s)
|
||||||
DEBUG ?= false
|
DEBUG ?= false
|
||||||
TOOLCHAIN ?= clang
|
TOOLCHAIN ?= clang
|
||||||
IMAGES_OPTIMIZED ?= true
|
|
||||||
FORCE_INTEGRATED_GPU ?= false
|
|
||||||
GRAPHICS_MEMORY_DUMP ?= false
|
GRAPHICS_MEMORY_DUMP ?= false
|
||||||
PROFILER ?= false
|
PROFILER ?= false
|
||||||
FORCE_WAYLAND ?= false
|
FORCE_WAYLAND ?= false
|
||||||
@@ -38,6 +36,9 @@ GCH = runtime/Includes/PreCompiled.h.gch
|
|||||||
CCH = runtime/Includes/PreCompiled.h.pch
|
CCH = runtime/Includes/PreCompiled.h.pch
|
||||||
PCH =
|
PCH =
|
||||||
|
|
||||||
|
# Personal path, should be overriden with env var
|
||||||
|
UNIT_TESTS_PATH = ../UnitTester/build/Bin/linux_x86_64/MacroUnitTest
|
||||||
|
|
||||||
NZSLC ?= nzslc
|
NZSLC ?= nzslc
|
||||||
|
|
||||||
ifeq ($(TOOLCHAIN), gcc)
|
ifeq ($(TOOLCHAIN), gcc)
|
||||||
@@ -62,14 +63,6 @@ else
|
|||||||
CXXFLAGS += -O3
|
CXXFLAGS += -O3
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(FORCE_INTEGRATED_GPU), true)
|
|
||||||
_ENABLEDFLAGS += FORCE_INTEGRATED_GPU
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(IMAGES_OPTIMIZED), true)
|
|
||||||
_ENABLEDFLAGS += IMAGE_OPTIMIZED
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(GRAPHICS_MEMORY_DUMP), true)
|
ifeq ($(GRAPHICS_MEMORY_DUMP), true)
|
||||||
_ENABLEDFLAGS += GRAPHICS_MEMORY_DUMP
|
_ENABLEDFLAGS += GRAPHICS_MEMORY_DUMP
|
||||||
endif
|
endif
|
||||||
@@ -161,6 +154,9 @@ clean-shaders:
|
|||||||
|
|
||||||
shaders: clean-shaders $(SPVS)
|
shaders: clean-shaders $(SPVS)
|
||||||
|
|
||||||
|
tests: debug
|
||||||
|
@$(UNIT_TESTS_PATH) --headless --path="./$(NAME)"
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@$(RM) $(OBJ_DIR)
|
@$(RM) $(OBJ_DIR)
|
||||||
@printf "Cleaned $(_BOLD)$(OBJ_DIR)$(_RESET)\n"
|
@printf "Cleaned $(_BOLD)$(OBJ_DIR)$(_RESET)\n"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<div align="center">
|
<div align="center">
|
||||||
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/linux_clang.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/linux_clang.yml/badge.svg"></a>
|
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/linux_clang.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/linux_clang.yml/badge.svg"></a>
|
||||||
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/linux_gcc.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/linux_gcc.yml/badge.svg"></a>
|
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/linux_gcc.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/linux_gcc.yml/badge.svg"></a>
|
||||||
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/macos_x86.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/macos_x86.yml/badge.svg"></a>
|
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/macos.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/macos.yml/badge.svg"></a>
|
||||||
</div>
|
</div>
|
||||||
<div align="center">
|
<div align="center">
|
||||||
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/windows.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/windows.yml/badge.svg"></a>
|
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/windows.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/windows.yml/badge.svg"></a>
|
||||||
@@ -103,12 +103,6 @@ MacroLibX has a strong safety support, mainly by checking every pointer that you
|
|||||||
### 🛠️ Set the toolchain
|
### 🛠️ Set the toolchain
|
||||||
If you want to use `GCC` to build the mlx you can use `make TOOLCHAIN=gcc`
|
If you want to use `GCC` to build the mlx you can use `make TOOLCHAIN=gcc`
|
||||||
|
|
||||||
### ⚠️⚠️⚠️ 🖼️ Image optimisations ⚠️⚠️⚠️
|
|
||||||
If you run into glitches when writing or reading pixels from images you can turn off images optimisations by using `make IMAGES_OPTIMIZED=false`.
|
|
||||||
|
|
||||||
### 🖥️ Force the integrated GPU (not recommended)
|
|
||||||
You can force the mlx to use your integrated GPU by using `make FORCE_INTEGRATED_GPU=true`. Note that there are a lot of chances that your application crashes by using that.
|
|
||||||
|
|
||||||
### 💽 Dump the graphics memory
|
### 💽 Dump the graphics memory
|
||||||
The mlx can dump it's graphics memory use to json files every two seconds by enabling this option `make GRAPHICS_MEMORY_DUMP=true`.
|
The mlx can dump it's graphics memory use to json files every two seconds by enabling this option `make GRAPHICS_MEMORY_DUMP=true`.
|
||||||
|
|
||||||
|
|||||||
+1
-7
@@ -16,17 +16,11 @@ MacroLibX has a strong safety support, mainly by checking every pointer that you
|
|||||||
### 🛠️ Set the toolchain
|
### 🛠️ Set the toolchain
|
||||||
To change the compilation toolchain you can use `xmake config --toolchain=[gcc|clang|...]`
|
To change the compilation toolchain you can use `xmake config --toolchain=[gcc|clang|...]`
|
||||||
|
|
||||||
### ⚠️⚠️⚠️ 🖼️ Image optimisations ⚠️⚠️⚠️
|
|
||||||
If you run into glitches when writing or reading pixels from images you can turn off images optimisations by using `xmake config --images_optimized=n`.
|
|
||||||
|
|
||||||
### 🖥️ Force the integrated GPU (not recommended)
|
|
||||||
You can force the mlx to use your integrated GPU using `xmake config --force_integrated_gpu=y`. Note that there are a lot of chances that your application crashes by using that.
|
|
||||||
|
|
||||||
### 💽 Dump the graphics memory
|
### 💽 Dump the graphics memory
|
||||||
The mlx can dump it's graphics memory use to json files every two seconds by enabling this option `xmake config --graphics_memory_dump=y`.
|
The mlx can dump it's graphics memory use to json files every two seconds by enabling this option `xmake config --graphics_memory_dump=y`.
|
||||||
|
|
||||||
### 🪛 A possible build configuration
|
### 🪛 A possible build configuration
|
||||||
As a configuration example here's how the command can look like `xmake config --mode=debug --toolchain=clang --graphics_memory_dump=y --images_optimized=n`
|
As a configuration example here's how the command can look like `xmake config --mode=debug --toolchain=clang --graphics_memory_dump=y`
|
||||||
|
|
||||||
## 🚧 Build the lib
|
## 🚧 Build the lib
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,5 @@
|
|||||||
-DMLX_BUILD
|
-DMLX_BUILD
|
||||||
-DSDL_MAIN_HANDLED
|
-DSDL_MAIN_HANDLED
|
||||||
-DDEBUG
|
-DDEBUG
|
||||||
-DIMAGE_OPTIMIZED
|
|
||||||
-D_REENTRANT
|
-D_REENTRANT
|
||||||
-isystem/usr/include/SDL2
|
-isystem/usr/include/SDL2
|
||||||
|
|||||||
+7
-2
@@ -44,11 +44,16 @@ void update(void* param)
|
|||||||
mlx_set_font(mlx->mlx, "default");
|
mlx_set_font(mlx->mlx, "default");
|
||||||
mlx_string_put(mlx->mlx, mlx->win, 20, 50, (mlx_color){ .rgba = 0xFFFFFFFF }, "that's a text");
|
mlx_string_put(mlx->mlx, mlx->win, 20, 50, (mlx_color){ .rgba = 0xFFFFFFFF }, "that's a text");
|
||||||
|
|
||||||
|
int win_width;
|
||||||
|
int win_height;
|
||||||
|
|
||||||
|
mlx_get_window_size(mlx->mlx, mlx->win, &win_width, &win_height);
|
||||||
|
|
||||||
uint32_t color = 0;
|
uint32_t color = 0;
|
||||||
for(int j = 0; j < 400; j++)
|
for(int j = 0; j < win_height; j++)
|
||||||
{
|
{
|
||||||
mlx_pixel_put(mlx->mlx, mlx->win, j, j, (mlx_color){ .rgba = 0x0000FFFF + (color << 24) });
|
mlx_pixel_put(mlx->mlx, mlx->win, j, j, (mlx_color){ .rgba = 0x0000FFFF + (color << 24) });
|
||||||
mlx_pixel_put(mlx->mlx, mlx->win, 399 - j, j, (mlx_color){ .rgba = 0x0000FFFF });
|
mlx_pixel_put(mlx->mlx, mlx->win, win_width - j, j, (mlx_color){ .rgba = 0x0000FFFF });
|
||||||
color += (color < 255);
|
color += (color < 255);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,85 +0,0 @@
|
|||||||
import macrolibpy as mlpy
|
|
||||||
import pathlib
|
|
||||||
import os
|
|
||||||
import math
|
|
||||||
|
|
||||||
current_path = pathlib.Path(__file__).parent.resolve()
|
|
||||||
|
|
||||||
mlx = mlpy.Context.create()
|
|
||||||
win = mlx.new_window(400, 400, "My window")
|
|
||||||
mlx.set_fps_goal(60)
|
|
||||||
logo_png = mlx.new_image_from_file(os.path.join(current_path, "42_logo.png"))[0]
|
|
||||||
logo_bmp = mlx.new_image_from_file(os.path.join(current_path, "42_logo.bmp"))[0]
|
|
||||||
logo_jpg = mlx.new_image_from_file(os.path.join(current_path, "42_logo.jpg"))[0]
|
|
||||||
|
|
||||||
win.pixel_put(200, 10, 0xFF0FFFF)
|
|
||||||
win.put_image(logo_png, 0, 0)
|
|
||||||
|
|
||||||
mlx.set_font_scale(os.path.join(current_path, "font.ttf"), 16.0)
|
|
||||||
win.string_put(20, 20, 0x0020FFFF, "that text will disappear")
|
|
||||||
|
|
||||||
custom_img = mlx.new_image(100, 100)
|
|
||||||
i, j, k = 0, 0, 0
|
|
||||||
while i < (100 * 100) * 4:
|
|
||||||
if j >= 100:
|
|
||||||
j = 0
|
|
||||||
k += 1
|
|
||||||
if i < 10000 or i > 20000:
|
|
||||||
custom_img.set_pixel(j, k, (k << 24) | (j << 16) | (i << 8) | 0x99)
|
|
||||||
i += 4
|
|
||||||
j += 1
|
|
||||||
|
|
||||||
def onevent(ev):
|
|
||||||
if ev == 0:
|
|
||||||
mlx.loop_end()
|
|
||||||
|
|
||||||
THRESHOLD = 200
|
|
||||||
CIRCLE_RADIUS = 50
|
|
||||||
CIRCLE_DIAMETER = CIRCLE_RADIUS + CIRCLE_RADIUS
|
|
||||||
def onupdate():
|
|
||||||
if onupdate.i > THRESHOLD:
|
|
||||||
win.clear(0x334D4DFF)
|
|
||||||
win.put_transformed_image(logo_bmp, 220, 40, 0.5, 0.5, onupdate.i)
|
|
||||||
|
|
||||||
if onupdate.i >= THRESHOLD + THRESHOLD / 4:
|
|
||||||
mlx.set_font_scale("default", 16.0)
|
|
||||||
else:
|
|
||||||
mlx.set_font_scale("default", 6.0)
|
|
||||||
|
|
||||||
win.string_put(160, 120, 0xFF2066FF, "this text should be behind")
|
|
||||||
win.put_image(logo_png, 100, 100)
|
|
||||||
win.put_image(custom_img, 150, 60)
|
|
||||||
|
|
||||||
mlx.set_font("default")
|
|
||||||
win.string_put(20, 50, 0xFFFFFFFF, "that's a text")
|
|
||||||
|
|
||||||
color = 0
|
|
||||||
for j in range(0, 400):
|
|
||||||
win.pixel_put(j, j, 0x0000FFFF + (color << 24))
|
|
||||||
win.pixel_put(399 - j, j, 0x0000FFFF)
|
|
||||||
color += (color < 255)
|
|
||||||
|
|
||||||
if onupdate.i < THRESHOLD:
|
|
||||||
win.put_transformed_image(logo_jpg, 210, 150, 0.5, 2.0, 0.0)
|
|
||||||
else:
|
|
||||||
win.put_transformed_image(logo_jpg, 210, 150, abs(math.sin(onupdate.i / 100.0)), abs(math.cos(onupdate.i / 100.0) * 2.0), 0.0)
|
|
||||||
|
|
||||||
mlx.set_font_scale("default", 8.0)
|
|
||||||
win.string_put(210, 175, 0xFFAF2BFF, "hidden")
|
|
||||||
|
|
||||||
win.pixel_put_region(200, 170, CIRCLE_DIAMETER, CIRCLE_DIAMETER, onupdate.pixels_circle)
|
|
||||||
|
|
||||||
onupdate.i += 1
|
|
||||||
onupdate.i = 0
|
|
||||||
onupdate.pixels_circle = [pixel for pixel in range(0, CIRCLE_DIAMETER * CIRCLE_DIAMETER)]
|
|
||||||
|
|
||||||
i = 0
|
|
||||||
for j in range(0, CIRCLE_DIAMETER):
|
|
||||||
for k in range(0, CIRCLE_DIAMETER):
|
|
||||||
if((CIRCLE_RADIUS - j) * (CIRCLE_RADIUS - j) + (CIRCLE_RADIUS - k) * (CIRCLE_RADIUS - k) < CIRCLE_RADIUS * CIRCLE_RADIUS):
|
|
||||||
onupdate.pixels_circle[i] = 0xA10000FF + ((j * k * i) << 8)
|
|
||||||
i += 1
|
|
||||||
|
|
||||||
win.on_event(mlpy.EventType.WINDOW_EVENT, onevent)
|
|
||||||
mlx.add_loop_hook(onupdate)
|
|
||||||
mlx.loop()
|
|
||||||
+2
-20
@@ -6,7 +6,7 @@
|
|||||||
/* By: maldavid <contact@kbz8.me> +#+ +:+ +#+ */
|
/* By: maldavid <contact@kbz8.me> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2022/10/04 16:56:35 by maldavid #+# #+# */
|
/* Created: 2022/10/04 16:56:35 by maldavid #+# #+# */
|
||||||
/* Updated: 2025/03/12 22:26:32 by maldavid ### ########.fr */
|
/* Updated: 2025/10/22 16:59:21 by maldavid ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@@ -338,7 +338,7 @@ MLX_API mlx_image mlx_new_image(mlx_context mlx, int width, int height);
|
|||||||
* @param mlx Internal MLX application
|
* @param mlx Internal MLX application
|
||||||
* @param filename Path to the png file
|
* @param filename Path to the png file
|
||||||
* @param width Get the width of the image
|
* @param width Get the width of the image
|
||||||
* @param heigth Get the height of the image
|
* @param height Get the height of the image
|
||||||
*
|
*
|
||||||
* @return (mlx_image) An opaque handler to the internal image or MLX_NULL_HANDLE (0x0) in case of error
|
* @return (mlx_image) An opaque handler to the internal image or MLX_NULL_HANDLE (0x0) in case of error
|
||||||
*/
|
*/
|
||||||
@@ -361,14 +361,6 @@ MLX_API void mlx_destroy_image(mlx_context mlx, mlx_image image);
|
|||||||
* @param y Y coordinate in the image
|
* @param y Y coordinate in the image
|
||||||
*
|
*
|
||||||
* @return (int) Return the pixel data
|
* @return (int) Return the pixel data
|
||||||
*
|
|
||||||
* /!\ If you run into glitches when writing or reading pixels from images /!\
|
|
||||||
* You need to add IMAGES_OPTIMIZED=false to your make mlx command
|
|
||||||
* ```
|
|
||||||
* ~ git clone https://github.com/seekrs/MacroLibX.git
|
|
||||||
* ~ cd MacroLibX
|
|
||||||
* ~ make IMAGES_OPTIMIZED=false
|
|
||||||
* ```
|
|
||||||
*/
|
*/
|
||||||
MLX_API mlx_color mlx_get_image_pixel(mlx_context mlx, mlx_image image, int x, int y);
|
MLX_API mlx_color mlx_get_image_pixel(mlx_context mlx, mlx_image image, int x, int y);
|
||||||
|
|
||||||
@@ -380,14 +372,6 @@ MLX_API mlx_color mlx_get_image_pixel(mlx_context mlx, mlx_image image, int x, i
|
|||||||
* @param x X coordinate in the image
|
* @param x X coordinate in the image
|
||||||
* @param y Y coordinate in the image
|
* @param y Y coordinate in the image
|
||||||
* @param color Color of the pixel to set
|
* @param color Color of the pixel to set
|
||||||
*
|
|
||||||
* /!\ If you run into glitches when writing or reading pixels from images /!\
|
|
||||||
* You need to add IMAGES_OPTIMIZED=false to your make mlx command
|
|
||||||
* ```
|
|
||||||
* ~ git clone https://github.com/seekrs/MacroLibX.git
|
|
||||||
* ~ cd MacroLibX
|
|
||||||
* ~ make IMAGES_OPTIMIZED=false
|
|
||||||
* ```
|
|
||||||
*/
|
*/
|
||||||
MLX_API void mlx_set_image_pixel(mlx_context mlx, mlx_image image, int x, int y, mlx_color color);
|
MLX_API void mlx_set_image_pixel(mlx_context mlx, mlx_image image, int x, int y, mlx_color color);
|
||||||
|
|
||||||
@@ -423,7 +407,6 @@ MLX_API void mlx_string_put(mlx_context mlx, mlx_window win, int x, int y, mlx_c
|
|||||||
* @brief Loads a font to be used by `mlx_string_put`
|
* @brief Loads a font to be used by `mlx_string_put`
|
||||||
*
|
*
|
||||||
* @param mlx Internal MLX application
|
* @param mlx Internal MLX application
|
||||||
* @param win Internal window
|
|
||||||
* @param filepath Filepath to the font or "default" to reset to the embedded font
|
* @param filepath Filepath to the font or "default" to reset to the embedded font
|
||||||
*/
|
*/
|
||||||
MLX_API void mlx_set_font(mlx_context mlx, char* filepath);
|
MLX_API void mlx_set_font(mlx_context mlx, char* filepath);
|
||||||
@@ -432,7 +415,6 @@ MLX_API void mlx_set_font(mlx_context mlx, char* filepath);
|
|||||||
* @brief Loads a font to be used by `mlx_string_put` and scales it
|
* @brief Loads a font to be used by `mlx_string_put` and scales it
|
||||||
*
|
*
|
||||||
* @param mlx Internal MLX application
|
* @param mlx Internal MLX application
|
||||||
* @param win Internal window
|
|
||||||
* @param filepath Filepath to the font or "default" to reset to the embedded font
|
* @param filepath Filepath to the font or "default" to reset to the embedded font
|
||||||
* @param scale Scale to apply to the font
|
* @param scale Scale to apply to the font
|
||||||
*/
|
*/
|
||||||
|
|||||||
+1
-17
@@ -6,7 +6,7 @@
|
|||||||
/* By: maldavid <contact@kbz8.me> +#+ +:+ +#+ */
|
/* By: maldavid <contact@kbz8.me> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/12/14 16:17:10 by maldavid #+# #+# */
|
/* Created: 2024/12/14 16:17:10 by maldavid #+# #+# */
|
||||||
/* Updated: 2025/03/12 22:03:45 by maldavid ### ########.fr */
|
/* Updated: 2025/10/22 16:59:38 by maldavid ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@@ -122,14 +122,6 @@ MLX_API void mlx_pixel_put_region(mlx_context mlx, mlx_window win, int x, int y,
|
|||||||
*
|
*
|
||||||
* Note: it is responsability of the user to make sure the size of `dst` is
|
* Note: it is responsability of the user to make sure the size of `dst` is
|
||||||
* big enough for the given region.
|
* big enough for the given region.
|
||||||
*
|
|
||||||
* /!\ If you run into glitches when writing or reading pixels from images /!\
|
|
||||||
* You need to add IMAGES_OPTIMIZED=false to your make mlx command
|
|
||||||
* ```
|
|
||||||
* ~ git clone https://github.com/seekrs/MacroLibX.git
|
|
||||||
* ~ cd MacroLibX
|
|
||||||
* ~ make IMAGES_OPTIMIZED=false
|
|
||||||
* ```
|
|
||||||
*/
|
*/
|
||||||
MLX_API void mlx_get_image_region(mlx_context mlx, mlx_image image, int x, int y, int w, int h, mlx_color* dst);
|
MLX_API void mlx_get_image_region(mlx_context mlx, mlx_image image, int x, int y, int w, int h, mlx_color* dst);
|
||||||
|
|
||||||
@@ -146,14 +138,6 @@ MLX_API void mlx_get_image_region(mlx_context mlx, mlx_image image, int x, int y
|
|||||||
*
|
*
|
||||||
* Note: it is responsability of the user to make sure the size of `pixels` is
|
* Note: it is responsability of the user to make sure the size of `pixels` is
|
||||||
* big enough for the given region.
|
* big enough for the given region.
|
||||||
*
|
|
||||||
* /!\ If you run into glitches when writing or reading pixels from images /!\
|
|
||||||
* You need to add IMAGES_OPTIMIZED=false to your make mlx command
|
|
||||||
* ```
|
|
||||||
* ~ git clone https://github.com/seekrs/MacroLibX.git
|
|
||||||
* ~ cd MacroLibX
|
|
||||||
* ~ make IMAGES_OPTIMIZED=false
|
|
||||||
* ```
|
|
||||||
*/
|
*/
|
||||||
MLX_API void mlx_set_image_region(mlx_context mlx, mlx_image image, int x, int y, int w, int h, mlx_color* pixels);
|
MLX_API void mlx_set_image_region(mlx_context mlx, mlx_image image, int x, int y, int w, int h, mlx_color* pixels);
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
|
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2023/11/10 08:49:17 by maldavid #+# #+# */
|
/* Created: 2023/11/10 08:49:17 by maldavid #+# #+# */
|
||||||
/* Updated: 2025/03/12 22:01:07 by maldavid ### ########.fr */
|
/* Updated: 2025/10/22 13:38:43 by maldavid ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@@ -206,7 +206,7 @@
|
|||||||
|
|
||||||
typedef void (*mlx_function)(void);
|
typedef void (*mlx_function)(void);
|
||||||
|
|
||||||
#define MLX_VERSION MLX_MAKE_VERSION(2, 0, 0)
|
#define MLX_VERSION MLX_MAKE_VERSION(2, 2, 4)
|
||||||
#define MLX_TARGET_VULKAN_API_VERSION MLX_MAKE_VERSION(1, 0, 0)
|
#define MLX_TARGET_VULKAN_API_VERSION MLX_MAKE_VERSION(1, 0, 0)
|
||||||
|
|
||||||
// Checking common assumptions
|
// Checking common assumptions
|
||||||
|
|||||||
@@ -1,368 +0,0 @@
|
|||||||
"""
|
|
||||||
macrolibpy — thin, Pythonic bindings over MacroLibX.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
from enum import IntEnum
|
|
||||||
from typing import Callable, Optional, Any, List
|
|
||||||
import os, sys
|
|
||||||
from cffi import FFI
|
|
||||||
import pathlib
|
|
||||||
|
|
||||||
__all__ = ["Context", "Window", "Image", "Event"]
|
|
||||||
|
|
||||||
ffi = FFI()
|
|
||||||
|
|
||||||
# NOTE: This is a curated declaration set focused on the core API
|
|
||||||
ffi.cdef(
|
|
||||||
r"""
|
|
||||||
typedef unsigned char uint8_t;
|
|
||||||
typedef unsigned int uint32_t;
|
|
||||||
|
|
||||||
typedef void (*mlx_function)(void);
|
|
||||||
typedef struct mlx_context_handler* mlx_context;
|
|
||||||
typedef struct mlx_window_handler* mlx_window;
|
|
||||||
typedef struct mlx_image_handler* mlx_image;
|
|
||||||
|
|
||||||
typedef struct mlx_color
|
|
||||||
{
|
|
||||||
uint32_t rgba;
|
|
||||||
} mlx_color;
|
|
||||||
|
|
||||||
typedef enum mlx_event_type
|
|
||||||
{
|
|
||||||
MLX_KEYDOWN = 0,
|
|
||||||
MLX_KEYUP = 1,
|
|
||||||
MLX_MOUSEDOWN = 2,
|
|
||||||
MLX_MOUSEUP = 3,
|
|
||||||
MLX_MOUSEWHEEL = 4,
|
|
||||||
MLX_WINDOW_EVENT = 5
|
|
||||||
} mlx_event_type;
|
|
||||||
|
|
||||||
typedef struct mlx_window_create_info
|
|
||||||
{
|
|
||||||
mlx_image render_target;
|
|
||||||
const char* title;
|
|
||||||
int width;
|
|
||||||
int height;
|
|
||||||
_Bool is_fullscreen;
|
|
||||||
_Bool is_resizable;
|
|
||||||
} mlx_window_create_info;
|
|
||||||
|
|
||||||
mlx_context mlx_init();
|
|
||||||
void mlx_set_fps_goal(mlx_context mlx, int fps);
|
|
||||||
void mlx_destroy_context(mlx_context mlx);
|
|
||||||
mlx_window mlx_new_window(mlx_context mlx, const mlx_window_create_info* info);
|
|
||||||
void mlx_destroy_window(mlx_context mlx, mlx_window win);
|
|
||||||
void mlx_set_window_position(mlx_context mlx, mlx_window win, int x, int y);
|
|
||||||
void mlx_set_window_size(mlx_context mlx, mlx_window win, int width, int height);
|
|
||||||
void mlx_set_window_title(mlx_context mlx, mlx_window win, const char* title);
|
|
||||||
void mlx_set_window_fullscreen(mlx_context mlx, mlx_window win, _Bool enable);
|
|
||||||
void mlx_get_window_position(mlx_context mlx, mlx_window win, int* x, int* y);
|
|
||||||
void mlx_get_window_size(mlx_context mlx, mlx_window win, int* x, int* y);
|
|
||||||
void mlx_clear_window(mlx_context mlx, mlx_window win, mlx_color color);
|
|
||||||
void mlx_get_screen_size(mlx_context mlx, mlx_window win, int* w, int* h);
|
|
||||||
void mlx_add_loop_hook(mlx_context mlx, void(*f)(void*), void* param);
|
|
||||||
void mlx_loop(mlx_context mlx);
|
|
||||||
void mlx_loop_end(mlx_context mlx);
|
|
||||||
void mlx_mouse_show(mlx_context mlx);
|
|
||||||
void mlx_mouse_hide(mlx_context mlx);
|
|
||||||
void mlx_mouse_move(mlx_context mlx, mlx_window win, int x, int y);
|
|
||||||
void mlx_mouse_get_pos(mlx_context mlx, int* x, int* y);
|
|
||||||
void mlx_on_event(mlx_context mlx, mlx_window win, mlx_event_type event, void(*f)(int, void*), void* param);
|
|
||||||
void mlx_pixel_put(mlx_context mlx, mlx_window win, int x, int y, mlx_color color);
|
|
||||||
mlx_image mlx_new_image(mlx_context mlx, int width, int height);
|
|
||||||
mlx_image mlx_new_image_from_file(mlx_context mlx, char* filename, int* width, int* height);
|
|
||||||
void mlx_destroy_image(mlx_context mlx, mlx_image image);
|
|
||||||
mlx_color mlx_get_image_pixel(mlx_context mlx, mlx_image image, int x, int y);
|
|
||||||
void mlx_set_image_pixel(mlx_context mlx, mlx_image image, int x, int y, mlx_color color);
|
|
||||||
void mlx_put_image_to_window(mlx_context mlx, mlx_window win, mlx_image image, int x, int y);
|
|
||||||
void mlx_string_put(mlx_context mlx, mlx_window win, int x, int y, mlx_color color, char* str);
|
|
||||||
void mlx_set_font(mlx_context mlx, char* filepath);
|
|
||||||
void mlx_set_font_scale(mlx_context mlx, char* filepath, float scale);
|
|
||||||
|
|
||||||
void mlx_set_window_max_size(mlx_context mlx, mlx_window win, int x, int y);
|
|
||||||
void mlx_set_window_min_size(mlx_context mlx, mlx_window win, int x, int y);
|
|
||||||
void mlx_maximise_window(mlx_context mlx, mlx_window win);
|
|
||||||
void mlx_minimize_window(mlx_context mlx, mlx_window win);
|
|
||||||
void mlx_restore_window(mlx_context mlx, mlx_window win);
|
|
||||||
void mlx_pixel_put_array(mlx_context mlx, mlx_window win, int x, int y, mlx_color* pixels, size_t pixels_number);
|
|
||||||
void mlx_pixel_put_region(mlx_context mlx, mlx_window win, int x, int y, int w, int h, mlx_color* pixels);
|
|
||||||
void mlx_get_image_region(mlx_context mlx, mlx_image image, int x, int y, int w, int h, mlx_color* dst);
|
|
||||||
void mlx_set_image_region(mlx_context mlx, mlx_image image, int x, int y, int w, int h, mlx_color* pixels);
|
|
||||||
void mlx_put_transformed_image_to_window(mlx_context mlx, mlx_window win, mlx_image image, int x, int y, float scale_x, float scale_y, float angle);
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
def _candidateLibNames() -> List[str]:
|
|
||||||
if sys.platform.startswith("linux"):
|
|
||||||
return ["libmlx.so"]
|
|
||||||
if sys.platform == "darwin":
|
|
||||||
return ["libmlx.dylib"]
|
|
||||||
if sys.platform.startswith("win"):
|
|
||||||
# depending on build system, either of these may exist
|
|
||||||
return ["mlx.dll", "libmlx.dll"]
|
|
||||||
return []
|
|
||||||
|
|
||||||
def _candidateSdl2Names() -> List[str]:
|
|
||||||
if sys.platform.startswith("linux"):
|
|
||||||
# Try common SONAMEs (distro dependent)
|
|
||||||
return ["libSDL2-2.0.so.0", "libSDL2.so.0", "libSDL2.so"]
|
|
||||||
if sys.platform == "darwin":
|
|
||||||
return ["libSDL2-2.0.0.dylib", "libSDL2.dylib"]
|
|
||||||
if sys.platform.startswith("win"):
|
|
||||||
return ["SDL2.dll"]
|
|
||||||
return []
|
|
||||||
|
|
||||||
def _loadLibrary(candidates: List[str]):
|
|
||||||
last_err: Optional[BaseException] = None
|
|
||||||
RTLD_NOW = 2
|
|
||||||
RTLD_GLOBAL = 0x100
|
|
||||||
for path in candidates:
|
|
||||||
try:
|
|
||||||
return ffi.dlopen(path, RTLD_NOW | RTLD_GLOBAL)
|
|
||||||
except OSError as e:
|
|
||||||
last_err = e
|
|
||||||
raise OSError(
|
|
||||||
f"Could not load library:\n"
|
|
||||||
f"\tTried: {candidates}.\n"
|
|
||||||
f"\tLast error: {last_err}"
|
|
||||||
)
|
|
||||||
|
|
||||||
def _dlopenMlx():
|
|
||||||
_loadLibrary(_candidateSdl2Names())
|
|
||||||
candidates: List[str] = []
|
|
||||||
for name in _candidateLibNames():
|
|
||||||
candidates.append(os.path.join(pathlib.Path(__file__).parent.parent.resolve(), name))
|
|
||||||
return _loadLibrary(candidates)
|
|
||||||
|
|
||||||
lib = _dlopenMlx()
|
|
||||||
|
|
||||||
class EventType(IntEnum):
|
|
||||||
KEYDOWN = 0
|
|
||||||
KEYUP = 1
|
|
||||||
MOUSEDOWN = 2
|
|
||||||
MOUSEUP = 3
|
|
||||||
MOUSEWHEEL = 4
|
|
||||||
WINDOW_EVENT = 5
|
|
||||||
|
|
||||||
class MlxError(RuntimeError):
|
|
||||||
pass
|
|
||||||
|
|
||||||
# Keep Python references to cffi callbacks alive
|
|
||||||
_alive_callbacks: List[Any] = []
|
|
||||||
|
|
||||||
def _makeLoopCallback(pyfunc: Callable[[], None]):
|
|
||||||
@ffi.callback("void(void*)")
|
|
||||||
def cfunc(userdata):
|
|
||||||
pyfunc()
|
|
||||||
_alive_callbacks.append(cfunc)
|
|
||||||
return cfunc
|
|
||||||
|
|
||||||
def _makeEventCallback(pyfunc: Callable[[int], None]):
|
|
||||||
@ffi.callback("void(int, void*)")
|
|
||||||
def cfunc(event, userdata):
|
|
||||||
pyfunc(int(event))
|
|
||||||
_alive_callbacks.append(cfunc)
|
|
||||||
return cfunc
|
|
||||||
|
|
||||||
def _rgbaToColor(rgba: int):
|
|
||||||
c = ffi.new("mlx_color*")
|
|
||||||
c[0].rgba = int(rgba) & 0xFFFFFFFF
|
|
||||||
return c[0]
|
|
||||||
|
|
||||||
class Context:
|
|
||||||
__slots__ = ("_ctx",)
|
|
||||||
|
|
||||||
def __init__(self, _ptr) -> None:
|
|
||||||
self._ctx = _ptr
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def create(cls) -> "Context":
|
|
||||||
ctx = lib.mlx_init()
|
|
||||||
if ctx == ffi.NULL:
|
|
||||||
raise MlxError("mlx_init failed")
|
|
||||||
return cls(ctx)
|
|
||||||
|
|
||||||
def set_fps_goal(self, fps: int) -> None:
|
|
||||||
lib.mlx_set_fps_goal(self._ctx, int(fps))
|
|
||||||
|
|
||||||
def add_loop_hook(self, fn: Callable[[], None]) -> None:
|
|
||||||
lib.mlx_add_loop_hook(self._ctx, _makeLoopCallback(fn), ffi.NULL)
|
|
||||||
|
|
||||||
def new_window(
|
|
||||||
self,
|
|
||||||
width: int,
|
|
||||||
height: int,
|
|
||||||
title: str,
|
|
||||||
resizable: bool = True,
|
|
||||||
fullscreen: bool = False,
|
|
||||||
) -> "Window":
|
|
||||||
ffi_title = ffi.new("char[]", title.encode('ascii', 'replace'))
|
|
||||||
|
|
||||||
info = ffi.new("mlx_window_create_info*")
|
|
||||||
info.render_target = ffi.NULL
|
|
||||||
info.title = ffi_title
|
|
||||||
info.width = int(width)
|
|
||||||
info.height = int(height)
|
|
||||||
info.is_fullscreen = bool(fullscreen)
|
|
||||||
info.is_resizable = bool(resizable)
|
|
||||||
win = lib.mlx_new_window(self._ctx, info)
|
|
||||||
if win == ffi.NULL:
|
|
||||||
raise MlxError("mlx_new_window failed")
|
|
||||||
return Window(self, win)
|
|
||||||
|
|
||||||
def new_image(self, width: int, height: int) -> "Image":
|
|
||||||
img = lib.mlx_new_image(self._ctx, int(width), int(height))
|
|
||||||
if img == ffi.NULL:
|
|
||||||
raise MlxError("mlx_new_image failed")
|
|
||||||
return Image(self, img)
|
|
||||||
|
|
||||||
def new_image_from_file(self, path: str) -> Tuple["Image", int, int]:
|
|
||||||
w = ffi.new("int[]", 1);
|
|
||||||
h = ffi.new("int[]", 1);
|
|
||||||
ffi_path = ffi.new("char[]", path.encode('ascii'))
|
|
||||||
img = lib.mlx_new_image_from_file(self._ctx, ffi_path, w, h)
|
|
||||||
if img == ffi.NULL:
|
|
||||||
raise MlxError("mlx_new_image failed")
|
|
||||||
return (Image(self, img), w, h)
|
|
||||||
|
|
||||||
def loop(self) -> None:
|
|
||||||
lib.mlx_loop(self._ctx)
|
|
||||||
|
|
||||||
def loop_end(self) -> None:
|
|
||||||
lib.mlx_loop_end(self._ctx)
|
|
||||||
|
|
||||||
def destroy(self) -> None:
|
|
||||||
if getattr(self, "_ctx", None):
|
|
||||||
lib.mlx_destroy_context(self._ctx)
|
|
||||||
self._ctx = ffi.NULL
|
|
||||||
|
|
||||||
def mouse_show(self) -> None:
|
|
||||||
lib.mlx_mouse_show(self._ctx)
|
|
||||||
|
|
||||||
def mouse_hide(self) -> None:
|
|
||||||
lib.mlx_mouse_hide(self._ctx)
|
|
||||||
|
|
||||||
def mouse_move(self, x: int, y: int) -> None:
|
|
||||||
lib.mlx_mouse_move(self._ctx, int(x), int(y))
|
|
||||||
|
|
||||||
def get_mouse_position(self) -> Tuple[int, int]:
|
|
||||||
x = ffi.new("int[]", 1);
|
|
||||||
y = ffi.new("int[]", 1);
|
|
||||||
lib.mlx_mouse_get_pos(self._ctx, x, y)
|
|
||||||
return (x[0], y[0])
|
|
||||||
|
|
||||||
def set_font(self, path: str) -> None:
|
|
||||||
ffi_path = ffi.new("char[]", path.encode('ascii'))
|
|
||||||
lib.mlx_set_font(self._ctx, ffi_path)
|
|
||||||
|
|
||||||
def set_font_scale(self, path: str, scale: float) -> None:
|
|
||||||
ffi_path = ffi.new("char[]", path.encode('ascii'))
|
|
||||||
lib.mlx_set_font_scale(self._ctx, ffi_path, float(scale))
|
|
||||||
|
|
||||||
def __del__(self):
|
|
||||||
try:
|
|
||||||
self.destroy()
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
class Window:
|
|
||||||
__slots__ = ("_ctx", "_win")
|
|
||||||
|
|
||||||
def __init__(self, ctx: Context, win) -> None:
|
|
||||||
self._ctx = ctx
|
|
||||||
self._win = win
|
|
||||||
|
|
||||||
def set_title(self, title: str) -> None:
|
|
||||||
ffi_title = ffi.new("char[]", title.encode('ascii', 'replace'))
|
|
||||||
lib.mlx_set_window_title(self._ctx._ctx, self._win, ffi_title)
|
|
||||||
|
|
||||||
def set_position(self, x: int, y: int) -> None:
|
|
||||||
lib.mlx_set_window_position(self._ctx._ctx, self._win, int(x), int(y))
|
|
||||||
|
|
||||||
def set_size(self, w: int, h: int) -> None:
|
|
||||||
lib.mlx_set_window_size(self._ctx._ctx, self._win, int(w), int(h))
|
|
||||||
|
|
||||||
def set_fullscreen(self, enable: bool) -> None:
|
|
||||||
lib.mlx_set_window_fullscreen(self._ctx._ctx, self._win, bool(enable))
|
|
||||||
|
|
||||||
def get_position(self) -> Tuple[int, int]:
|
|
||||||
x = ffi.new("int[]", 1);
|
|
||||||
y = ffi.new("int[]", 1);
|
|
||||||
lib.mlx_get_window_position(self._ctx._ctx, self._win, x, y)
|
|
||||||
return (x[0], y[0])
|
|
||||||
|
|
||||||
def get_size(self) -> Tuple[int, int]:
|
|
||||||
w = ffi.new("int[]", 1);
|
|
||||||
h = ffi.new("int[]", 1);
|
|
||||||
lib.mlx_get_window_size(self._ctx._ctx, self._win, w, h)
|
|
||||||
return (w[0], h[0])
|
|
||||||
|
|
||||||
def get_screen_size(self) -> Tuple[int, int]:
|
|
||||||
w = ffi.new("int[]", 1);
|
|
||||||
h = ffi.new("int[]", 1);
|
|
||||||
lib.mlx_get_screen_size(self._ctx._ctx, self._win, w, h)
|
|
||||||
return (w[0], h[0])
|
|
||||||
|
|
||||||
def clear(self, rgba: int = 0) -> None:
|
|
||||||
lib.mlx_clear_window(self._ctx._ctx, self._win, _rgbaToColor(rgba))
|
|
||||||
|
|
||||||
def pixel_put(self, x: int, y: int, rgba: int) -> None:
|
|
||||||
lib.mlx_pixel_put(self._ctx._ctx, self._win, int(x), int(y), _rgbaToColor(rgba))
|
|
||||||
|
|
||||||
def pixel_put_array(self, x: int, y: int, rgba: list[int]) -> None:
|
|
||||||
ffi_pixels = ffi.new("mlx_color[]", [_rgbaToColor(pixel) for pixel in rgba])
|
|
||||||
lib.mlx_pixel_put_array(self._ctx._ctx, self._win, int(x), int(y), ffi_pixels, int(rgba.len()))
|
|
||||||
|
|
||||||
def pixel_put_region(self, x: int, y: int, w: int, h: int, rgba: list[int]) -> None:
|
|
||||||
ffi_pixels = ffi.new("mlx_color[]", [_rgbaToColor(pixel) for pixel in rgba])
|
|
||||||
lib.mlx_pixel_put_region(self._ctx._ctx, self._win, int(x), int(y), int(w), int(h), ffi_pixels)
|
|
||||||
|
|
||||||
def put_image(self, image: "Image", x: int, y: int) -> None:
|
|
||||||
lib.mlx_put_image_to_window(self._ctx._ctx, self._win, image._img, int(x), int(y))
|
|
||||||
|
|
||||||
def put_transformed_image(self, image: "Image", x: int, y: int, scale_x: float, scale_y: float, angle: float) -> None:
|
|
||||||
lib.mlx_put_transformed_image_to_window(self._ctx._ctx, self._win, image._img, int(x), int(y), float(scale_x), float(scale_y), float(angle))
|
|
||||||
|
|
||||||
def string_put(self, x: int, y: int, rgba: int, text: str) -> None:
|
|
||||||
ffi_text = ffi.new("char[]", text.encode('ascii', 'replace'))
|
|
||||||
lib.mlx_string_put(self._ctx._ctx, self._win, int(x), int(y), _rgbaToColor(rgba), ffi_text)
|
|
||||||
|
|
||||||
def on_event(self, event_type: EventType | int, fn: Callable[[int], None]) -> None:
|
|
||||||
lib.mlx_on_event(self._ctx._ctx, self._win, int(event_type), _makeEventCallback(fn), ffi.NULL)
|
|
||||||
|
|
||||||
def destroy(self) -> None:
|
|
||||||
if getattr(self, "_win", None):
|
|
||||||
lib.mlx_destroy_window(self._ctx._ctx, self._win)
|
|
||||||
self._win = ffi.NULL
|
|
||||||
|
|
||||||
def __del__(self):
|
|
||||||
try:
|
|
||||||
self.destroy()
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
class Image:
|
|
||||||
__slots__ = ("_ctx", "_img")
|
|
||||||
|
|
||||||
def __init__(self, ctx: Context, img) -> None:
|
|
||||||
self._ctx = ctx
|
|
||||||
self._img = img
|
|
||||||
|
|
||||||
def set_pixel(self, x: int, y: int, rgba: int) -> None:
|
|
||||||
lib.mlx_set_image_pixel(self._ctx._ctx, self._img, int(x), int(y), _rgbaToColor(rgba))
|
|
||||||
|
|
||||||
def get_pixel(self, x: int, y: int) -> int:
|
|
||||||
return lib.mlx_get_image_pixel(self._ctx._ctx, self._img, int(x), int(y))
|
|
||||||
|
|
||||||
def destroy(self) -> None:
|
|
||||||
if getattr(self, "_img", None):
|
|
||||||
lib.mlx_destroy_image(self._ctx._ctx, self._img)
|
|
||||||
self._img = ffi.NULL
|
|
||||||
|
|
||||||
def __del__(self):
|
|
||||||
try:
|
|
||||||
self.destroy()
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
+106
@@ -0,0 +1,106 @@
|
|||||||
|
project('MacroLibX',
|
||||||
|
['c', 'cpp'],
|
||||||
|
version : '2.3.0',
|
||||||
|
license : 'MIT',
|
||||||
|
meson_version : '>= 0.63.0',
|
||||||
|
default_options : [
|
||||||
|
'warning_level=2',
|
||||||
|
'optimization=3',
|
||||||
|
'cpp_std=c++20',
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
add_project_arguments('-DSDL_MAIN_HANDLED', language : 'c')
|
||||||
|
|
||||||
|
if get_option('graphics_memory_dump')
|
||||||
|
add_project_arguments('-DGRAPHICS_MEMORY_DUMP', language : 'c')
|
||||||
|
endif
|
||||||
|
|
||||||
|
if get_option('profiler')
|
||||||
|
add_project_arguments('-DPROFILER_ENABLED', language : 'c')
|
||||||
|
endif
|
||||||
|
|
||||||
|
if get_option('force_wayland')
|
||||||
|
add_project_arguments('-DFORCE_WAYLAND', language : 'c')
|
||||||
|
endif
|
||||||
|
|
||||||
|
if get_option('disable_all_safeties')
|
||||||
|
add_project_arguments('-DDISABLE_ALL_SAFETIES', language : 'c')
|
||||||
|
endif
|
||||||
|
|
||||||
|
includes_directories = include_directories(
|
||||||
|
'includes',
|
||||||
|
'runtime/Includes',
|
||||||
|
'runtime/Sources',
|
||||||
|
'third_party',
|
||||||
|
)
|
||||||
|
|
||||||
|
sources = files(
|
||||||
|
'runtime/Sources/Core/Application.cpp',
|
||||||
|
'runtime/Sources/Core/Bridge.cpp',
|
||||||
|
'runtime/Sources/Core/EventBus.cpp',
|
||||||
|
'runtime/Sources/Core/EventListener.cpp',
|
||||||
|
'runtime/Sources/Core/Fps.cpp',
|
||||||
|
'runtime/Sources/Core/Graphics.cpp',
|
||||||
|
'runtime/Sources/Core/Logs.cpp',
|
||||||
|
'runtime/Sources/Core/Memory.cpp',
|
||||||
|
'runtime/Sources/Core/Profiler.cpp',
|
||||||
|
'runtime/Sources/Core/SDLManager.cpp',
|
||||||
|
'runtime/Sources/Core/UUID.cpp',
|
||||||
|
'runtime/Sources/Graphics/Font.cpp',
|
||||||
|
'runtime/Sources/Graphics/Mesh.cpp',
|
||||||
|
'runtime/Sources/Graphics/PutPixelManager.cpp',
|
||||||
|
'runtime/Sources/Graphics/Scene.cpp',
|
||||||
|
'runtime/Sources/Graphics/Sprite.cpp',
|
||||||
|
'runtime/Sources/Graphics/Text.cpp',
|
||||||
|
'runtime/Sources/Platform/Inputs.cpp',
|
||||||
|
'runtime/Sources/Platform/Window.cpp',
|
||||||
|
'runtime/Sources/Renderer/Pipelines/Graphics.cpp',
|
||||||
|
'runtime/Sources/Renderer/Pipelines/Shader.cpp',
|
||||||
|
'runtime/Sources/Renderer/RenderPasses/2DPass.cpp',
|
||||||
|
'runtime/Sources/Renderer/RenderPasses/FinalPass.cpp',
|
||||||
|
'runtime/Sources/Renderer/RenderPasses/Passes.cpp',
|
||||||
|
'runtime/Sources/Renderer/Vulkan/VulkanLoader.cpp',
|
||||||
|
'runtime/Sources/Renderer/Buffer.cpp',
|
||||||
|
'runtime/Sources/Renderer/Descriptor.cpp',
|
||||||
|
'runtime/Sources/Renderer/Image.cpp',
|
||||||
|
'runtime/Sources/Renderer/Memory.cpp',
|
||||||
|
'runtime/Sources/Renderer/RenderCore.cpp',
|
||||||
|
'runtime/Sources/Renderer/Renderer.cpp',
|
||||||
|
'runtime/Sources/Renderer/SceneRenderer.cpp',
|
||||||
|
'runtime/Sources/Renderer/Swapchain.cpp',
|
||||||
|
)
|
||||||
|
|
||||||
|
mlx_headers = [
|
||||||
|
'includes/mlx.h',
|
||||||
|
'includes/mlx_extended.h',
|
||||||
|
'includes/mlx_profile.h'
|
||||||
|
]
|
||||||
|
|
||||||
|
install_headers(mlx_headers)
|
||||||
|
|
||||||
|
deps = dependency('sdl2')
|
||||||
|
|
||||||
|
libmlx = library('mlx',
|
||||||
|
sources,
|
||||||
|
include_directories : includes_directories,
|
||||||
|
dependencies : deps,
|
||||||
|
install : true)
|
||||||
|
|
||||||
|
libmlx_dep = declare_dependency(
|
||||||
|
include_directories: includes_directories,
|
||||||
|
dependencies : deps,
|
||||||
|
link_with : libmlx)
|
||||||
|
|
||||||
|
meson.override_dependency('mlx', libmlx_dep)
|
||||||
|
|
||||||
|
# PKG CONFIG GENERATION
|
||||||
|
pkg_mod = import('pkgconfig')
|
||||||
|
|
||||||
|
pkg_mod.generate(
|
||||||
|
libmlx,
|
||||||
|
name : 'mlx',
|
||||||
|
description : 'MacroLibX Library',
|
||||||
|
version : meson.project_version(),
|
||||||
|
subdirs : ['.'],
|
||||||
|
)
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
option('graphics_memory_dump',
|
||||||
|
type : 'boolean',
|
||||||
|
value : false,
|
||||||
|
description : 'Enable graphics memory dump for debugging purposes.'
|
||||||
|
)
|
||||||
|
|
||||||
|
option('profiler',
|
||||||
|
type : 'boolean',
|
||||||
|
value : false,
|
||||||
|
description : 'Enable profiler for performance analysis.'
|
||||||
|
)
|
||||||
|
|
||||||
|
option('force_wayland',
|
||||||
|
type : 'boolean',
|
||||||
|
value : false,
|
||||||
|
description : 'Force the application to use Wayland display server.'
|
||||||
|
)
|
||||||
|
|
||||||
|
option('disable_all_safeties',
|
||||||
|
type : 'boolean',
|
||||||
|
value : false,
|
||||||
|
description : 'Disable all safety checks in the application.'
|
||||||
|
)
|
||||||
@@ -47,7 +47,6 @@ namespace mlx
|
|||||||
|
|
||||||
std::unordered_map<std::string, std::pair<std::size_t, ProfileResult>> m_profile_data;
|
std::unordered_map<std::string, std::pair<std::size_t, ProfileResult>> m_profile_data;
|
||||||
std::ofstream m_output_stream;
|
std::ofstream m_output_stream;
|
||||||
std::mutex m_mutex;
|
|
||||||
bool m_runtime_session_began = false;
|
bool m_runtime_session_began = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ namespace mlx
|
|||||||
void SetInputBinding(std::function<void(SDL_Event*)> functor);
|
void SetInputBinding(std::function<void(SDL_Event*)> functor);
|
||||||
|
|
||||||
VkSurfaceKHR CreateVulkanSurface(Handle window, VkInstance instance) const noexcept;
|
VkSurfaceKHR CreateVulkanSurface(Handle window, VkInstance instance) const noexcept;
|
||||||
std::vector<const char*> GetRequiredVulkanInstanceExtentions(Handle window) const noexcept;
|
|
||||||
Vec2ui GetVulkanDrawableSize(Handle window) const noexcept;
|
Vec2ui GetVulkanDrawableSize(Handle window) const noexcept;
|
||||||
void MoveMouseOnWindow(Handle window, int x, int y) const noexcept;
|
void MoveMouseOnWindow(Handle window, int x, int y) const noexcept;
|
||||||
void GetScreenSizeWindowIsOn(Handle window, int* x, int* y) const noexcept;
|
void GetScreenSizeWindowIsOn(Handle window, int* x, int* y) const noexcept;
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ namespace mlx
|
|||||||
|
|
||||||
inline void UpdateDescriptorSet(std::shared_ptr<DescriptorSet> set)
|
inline void UpdateDescriptorSet(std::shared_ptr<DescriptorSet> set)
|
||||||
{
|
{
|
||||||
p_set = RenderCore::Get().GetDescriptorPoolManager().GetAvailablePool().RequestDescriptorSet(set->GetShaderLayout(), set->GetShaderType());
|
p_set = RenderCore::Get().GetDescriptorPoolManager().GetAvailablePool(set->GetShaderLayout(), set->GetShaderType()).RequestDescriptorSet(set->GetShaderLayout(), set->GetShaderType());
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void Bind(std::size_t frame_index, VkCommandBuffer cmd) = 0;
|
virtual void Bind(std::size_t frame_index, VkCommandBuffer cmd) = 0;
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ namespace mlx
|
|||||||
class PutPixelManager
|
class PutPixelManager
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
PutPixelManager(NonOwningPtr<class Renderer> renderer) : p_renderer(renderer) {}
|
PutPixelManager(NonOwningPtr<class Renderer> renderer);
|
||||||
|
|
||||||
// Returns a valid pointer when a new texture has been created
|
// Returns a valid pointer when a new texture has been created
|
||||||
NonOwningPtr<Texture> DrawPixel(int x, int y, std::uint64_t draw_layer, mlx_color color);
|
NonOwningPtr<Texture> DrawPixel(int x, int y, std::uint64_t draw_layer, mlx_color color);
|
||||||
@@ -20,6 +20,7 @@ namespace mlx
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
NonOwningPtr<Texture> GetLayer(std::uint64_t draw_layer, bool& is_newlayer);
|
NonOwningPtr<Texture> GetLayer(std::uint64_t draw_layer, bool& is_newlayer);
|
||||||
|
std::unique_ptr<Texture> NewTexture();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::unordered_map<std::uint64_t, NonOwningPtr<Texture>> m_placements;
|
std::unordered_map<std::uint64_t, NonOwningPtr<Texture>> m_placements;
|
||||||
|
|||||||
@@ -35,7 +35,6 @@ namespace mlx
|
|||||||
MLX_FORCEINLINE void GetSize(int* x, int* y) { *x = GetWidth(); *y = GetHeight(); }
|
MLX_FORCEINLINE void GetSize(int* x, int* y) { *x = GetWidth(); *y = GetHeight(); }
|
||||||
|
|
||||||
MLX_FORCEINLINE VkSurfaceKHR CreateVulkanSurface(VkInstance instance) const noexcept { return SDLManager::Get().CreateVulkanSurface(p_window, instance); }
|
MLX_FORCEINLINE VkSurfaceKHR CreateVulkanSurface(VkInstance instance) const noexcept { return SDLManager::Get().CreateVulkanSurface(p_window, instance); }
|
||||||
MLX_FORCEINLINE std::vector<const char*> GetRequiredVulkanInstanceExtentions() const noexcept { return SDLManager::Get().GetRequiredVulkanInstanceExtentions(p_window); }
|
|
||||||
MLX_FORCEINLINE Vec2ui GetVulkanDrawableSize() const noexcept { return SDLManager::Get().GetVulkanDrawableSize(p_window); }
|
MLX_FORCEINLINE Vec2ui GetVulkanDrawableSize() const noexcept { return SDLManager::Get().GetVulkanDrawableSize(p_window); }
|
||||||
|
|
||||||
[[nodiscard]] inline Handle GetRawHandle() const noexcept { return p_window; }
|
[[nodiscard]] inline Handle GetRawHandle() const noexcept { return p_window; }
|
||||||
|
|||||||
@@ -17,8 +17,21 @@
|
|||||||
|
|
||||||
#include <vulkan/vulkan.h>
|
#include <vulkan/vulkan.h>
|
||||||
|
|
||||||
#include <SDL2/SDL.h>
|
#if __has_include(<SDL2/SDL.h>)
|
||||||
#include <SDL2/SDL_vulkan.h>
|
#include <SDL2/SDL.h>
|
||||||
|
#elif __has_include(<SDL.h>)
|
||||||
|
#include <SDL.h>
|
||||||
|
#else
|
||||||
|
#error Failed to find SDL2 headers
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if __has_include(<SDL2/SDL_syswm.h>)
|
||||||
|
#include <SDL2/SDL_syswm.h>
|
||||||
|
#elif __has_include(<SDL_syswm.h>)
|
||||||
|
#include <SDL_syswm.h>
|
||||||
|
#else
|
||||||
|
#error Failed to find SDL2 SysWMinfo
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|||||||
@@ -26,9 +26,9 @@ namespace mlx
|
|||||||
|
|
||||||
std::shared_ptr<class DescriptorSet> RequestDescriptorSet(const ShaderSetLayout& layout, ShaderType shader_type);
|
std::shared_ptr<class DescriptorSet> RequestDescriptorSet(const ShaderSetLayout& layout, ShaderType shader_type);
|
||||||
void ReturnDescriptorSet(std::shared_ptr<class DescriptorSet> set);
|
void ReturnDescriptorSet(std::shared_ptr<class DescriptorSet> set);
|
||||||
|
bool CanAllocate(const ShaderSetLayout& layout, ShaderType shader_type) const;
|
||||||
|
|
||||||
[[nodiscard]] inline VkDescriptorPool Get() const noexcept { return m_pool; }
|
[[nodiscard]] inline VkDescriptorPool Get() const noexcept { return m_pool; }
|
||||||
[[nodiscard]] MLX_FORCEINLINE std::size_t GetNumberOfSetsAllocated() const noexcept { return m_allocation_count; }
|
|
||||||
|
|
||||||
~DescriptorPool() = default;
|
~DescriptorPool() = default;
|
||||||
|
|
||||||
@@ -36,7 +36,6 @@ namespace mlx
|
|||||||
std::vector<std::shared_ptr<class DescriptorSet>> m_free_sets;
|
std::vector<std::shared_ptr<class DescriptorSet>> m_free_sets;
|
||||||
std::vector<std::shared_ptr<class DescriptorSet>> m_used_sets;
|
std::vector<std::shared_ptr<class DescriptorSet>> m_used_sets;
|
||||||
VkDescriptorPool m_pool;
|
VkDescriptorPool m_pool;
|
||||||
std::size_t m_allocation_count = 0;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class DescriptorPoolManager
|
class DescriptorPoolManager
|
||||||
@@ -44,13 +43,13 @@ namespace mlx
|
|||||||
public:
|
public:
|
||||||
DescriptorPoolManager() = default;
|
DescriptorPoolManager() = default;
|
||||||
|
|
||||||
DescriptorPool& GetAvailablePool();
|
DescriptorPool& GetAvailablePool(const ShaderSetLayout& layout, ShaderType shader_type);
|
||||||
void Destroy();
|
void Destroy();
|
||||||
|
|
||||||
~DescriptorPoolManager() = default;
|
~DescriptorPoolManager() = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::vector<DescriptorPool> m_pools;
|
std::vector<std::unique_ptr<DescriptorPool>> m_pools;
|
||||||
};
|
};
|
||||||
|
|
||||||
class DescriptorSet : public std::enable_shared_from_this<DescriptorSet>
|
class DescriptorSet : public std::enable_shared_from_this<DescriptorSet>
|
||||||
|
|||||||
@@ -89,7 +89,13 @@ namespace mlx
|
|||||||
mlx_color GetPixel(int x, int y) noexcept;
|
mlx_color GetPixel(int x, int y) noexcept;
|
||||||
void GetRegion(int x, int y, int w, int h, mlx_color* dst) noexcept;
|
void GetRegion(int x, int y, int w, int h, mlx_color* dst) noexcept;
|
||||||
void Clear(VkCommandBuffer cmd, Vec4f color) override;
|
void Clear(VkCommandBuffer cmd, Vec4f color) override;
|
||||||
|
void CopyTo(Texture& other);
|
||||||
|
void Resize(std::uint32_t width, std::uint32_t height);
|
||||||
|
|
||||||
|
void Swap(Texture& texture) noexcept;
|
||||||
|
|
||||||
|
// If a valid cmd buffer is passed, this function takes ownership and makes it invalid after
|
||||||
|
void SyncCPUBuffer(VkCommandBuffer cmd = VK_NULL_HANDLE);
|
||||||
void Update(VkCommandBuffer cmd);
|
void Update(VkCommandBuffer cmd);
|
||||||
|
|
||||||
~Texture() override { Destroy(); }
|
~Texture() override { Destroy(); }
|
||||||
|
|||||||
@@ -38,8 +38,8 @@ namespace mlx
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
Swapchain m_swapchain;
|
Swapchain m_swapchain;
|
||||||
|
std::vector<VkSemaphore> m_render_finished_semaphores;
|
||||||
std::array<VkSemaphore, MAX_FRAMES_IN_FLIGHT> m_image_available_semaphores;
|
std::array<VkSemaphore, MAX_FRAMES_IN_FLIGHT> m_image_available_semaphores;
|
||||||
std::array<VkSemaphore, MAX_FRAMES_IN_FLIGHT> m_render_finished_semaphores;
|
|
||||||
std::array<VkCommandBuffer, MAX_FRAMES_IN_FLIGHT> m_cmd_buffers;
|
std::array<VkCommandBuffer, MAX_FRAMES_IN_FLIGHT> m_cmd_buffers;
|
||||||
std::array<VkFence, MAX_FRAMES_IN_FLIGHT> m_cmd_fences;
|
std::array<VkFence, MAX_FRAMES_IN_FLIGHT> m_cmd_fences;
|
||||||
NonOwningPtr<Window> p_window;
|
NonOwningPtr<Window> p_window;
|
||||||
|
|||||||
@@ -123,5 +123,41 @@
|
|||||||
MLX_VULKAN_INSTANCE_FUNCTION(vkGetPhysicalDeviceSurfaceFormatsKHR)
|
MLX_VULKAN_INSTANCE_FUNCTION(vkGetPhysicalDeviceSurfaceFormatsKHR)
|
||||||
MLX_VULKAN_INSTANCE_FUNCTION(vkGetPhysicalDeviceSurfacePresentModesKHR)
|
MLX_VULKAN_INSTANCE_FUNCTION(vkGetPhysicalDeviceSurfacePresentModesKHR)
|
||||||
MLX_VULKAN_INSTANCE_FUNCTION(vkGetPhysicalDeviceSurfaceSupportKHR)
|
MLX_VULKAN_INSTANCE_FUNCTION(vkGetPhysicalDeviceSurfaceSupportKHR)
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_ANDROID_KHR
|
||||||
|
#ifdef VK_KHR_android_surface
|
||||||
|
MLX_VULKAN_INSTANCE_FUNCTION(vkCreateAndroidSurfaceKHR)
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_XCB_KHR
|
||||||
|
#ifdef VK_KHR_xcb_surface
|
||||||
|
MLX_VULKAN_INSTANCE_FUNCTION(vkCreateXcbSurfaceKHR)
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_XLIB_KHR
|
||||||
|
#ifdef VK_KHR_xlib_surface
|
||||||
|
MLX_VULKAN_INSTANCE_FUNCTION(vkCreateXlibSurfaceKHR)
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_WAYLAND_KHR
|
||||||
|
#ifdef VK_KHR_wayland_surface
|
||||||
|
MLX_VULKAN_INSTANCE_FUNCTION(vkCreateWaylandSurfaceKHR)
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_WIN32_KHR
|
||||||
|
#ifdef VK_KHR_win32_surface
|
||||||
|
MLX_VULKAN_INSTANCE_FUNCTION(vkCreateWin32SurfaceKHR)
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_METAL_EXT
|
||||||
|
#ifdef VK_EXT_metal_surface
|
||||||
|
MLX_VULKAN_INSTANCE_FUNCTION(vkCreateMetalSurfaceEXT)
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -238,6 +238,15 @@ extern "C"
|
|||||||
mlx::Error("Image loader: not a valid file format '%'", filename);
|
mlx::Error("Image loader: not a valid file format '%'", filename);
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
std::ifstream stream(file, std::ios::binary);
|
||||||
|
if(!stream.is_open())
|
||||||
|
{
|
||||||
|
mlx::Error("Image loader: failed to open file '%'", filename);
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
}
|
||||||
return mlx->app->NewStbTexture(filename, width, height);
|
return mlx->app->NewStbTexture(filename, width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -304,12 +313,29 @@ extern "C"
|
|||||||
mlx::Error("Font loader: filepath is NULL");
|
mlx::Error("Font loader: filepath is NULL");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::filesystem::path file(filepath);
|
std::filesystem::path file(filepath);
|
||||||
if(std::strcmp(filepath, "default") != 0 && file.extension() != ".ttf" && file.extension() != ".tte")
|
if (std::strcmp(filepath, "default") != 0 && !std::filesystem::exists(file))
|
||||||
|
{
|
||||||
|
mlx::Error("TTF loader: unable to find file '%'", filepath);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(std::strcmp(filepath, "default") != 0)
|
||||||
|
{
|
||||||
|
if(file.extension() != ".ttf" && file.extension() != ".tte")
|
||||||
{
|
{
|
||||||
mlx::Error("TTF loader: not a truetype font file '%'", filepath);
|
mlx::Error("TTF loader: not a truetype font file '%'", filepath);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
std::ifstream stream(file, std::ios::binary);
|
||||||
|
if(!stream.is_open())
|
||||||
|
{
|
||||||
|
mlx::Error("TTF loader: failed to open font file '%'", filepath);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(std::strcmp(filepath, "default") == 0)
|
if(std::strcmp(filepath, "default") == 0)
|
||||||
mlx->app->LoadFont(file, 6.f);
|
mlx->app->LoadFont(file, 6.f);
|
||||||
else
|
else
|
||||||
@@ -324,12 +350,29 @@ extern "C"
|
|||||||
mlx::Error("Font loader: filepath is NULL");
|
mlx::Error("Font loader: filepath is NULL");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::filesystem::path file(filepath);
|
std::filesystem::path file(filepath);
|
||||||
if(std::strcmp(filepath, "default") != 0 && file.extension() != ".ttf" && file.extension() != ".tte")
|
if (std::strcmp(filepath, "default") != 0 && !std::filesystem::exists(file))
|
||||||
|
{
|
||||||
|
mlx::Error("TTF loader: unable to find file '%'", filepath);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(std::strcmp(filepath, "default") != 0)
|
||||||
|
{
|
||||||
|
if(file.extension() != ".ttf" && file.extension() != ".tte")
|
||||||
{
|
{
|
||||||
mlx::Error("TTF loader: not a truetype font file '%'", filepath);
|
mlx::Error("TTF loader: not a truetype font file '%'", filepath);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
std::ifstream stream(file, std::ios::binary);
|
||||||
|
if(!stream.is_open())
|
||||||
|
{
|
||||||
|
mlx::Error("TTF loader: failed to open font file '%'", filepath);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
mlx->app->LoadFont(file, scale);
|
mlx->app->LoadFont(file, scale);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -479,7 +522,7 @@ extern "C"
|
|||||||
MLX_CHECK_APPLICATION_POINTER(mlx);
|
MLX_CHECK_APPLICATION_POINTER(mlx);
|
||||||
mlx::NonOwningPtr<mlx::GraphicsSupport> gs = mlx->app->GetGraphicsSupport(win);
|
mlx::NonOwningPtr<mlx::GraphicsSupport> gs = mlx->app->GetGraphicsSupport(win);
|
||||||
if(!gs)
|
if(!gs)
|
||||||
return nullptr;
|
return VK_NULL_HANDLE;
|
||||||
return gs->GetRenderer().GetSwapchain().GetSurface();
|
return gs->GetRenderer().GetSwapchain().GetSurface();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -488,7 +531,7 @@ extern "C"
|
|||||||
MLX_CHECK_APPLICATION_POINTER(mlx);
|
MLX_CHECK_APPLICATION_POINTER(mlx);
|
||||||
mlx::NonOwningPtr<mlx::GraphicsSupport> gs = mlx->app->GetGraphicsSupport(win);
|
mlx::NonOwningPtr<mlx::GraphicsSupport> gs = mlx->app->GetGraphicsSupport(win);
|
||||||
if(!gs || index > gs->GetRenderer().GetSwapchain().GetImagesCount())
|
if(!gs || index > gs->GetRenderer().GetSwapchain().GetImagesCount())
|
||||||
return nullptr;
|
return VK_NULL_HANDLE;
|
||||||
return gs->GetRenderer().GetSwapchain().GetSwapchainImages()[index].Get();
|
return gs->GetRenderer().GetSwapchain().GetSwapchainImages()[index].Get();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -506,7 +549,7 @@ extern "C"
|
|||||||
MLX_CHECK_APPLICATION_POINTER(mlx);
|
MLX_CHECK_APPLICATION_POINTER(mlx);
|
||||||
mlx::NonOwningPtr<mlx::GraphicsSupport> gs = mlx->app->GetGraphicsSupport(win);
|
mlx::NonOwningPtr<mlx::GraphicsSupport> gs = mlx->app->GetGraphicsSupport(win);
|
||||||
if(!gs || index > gs->GetRenderer().GetSwapchain().GetImagesCount())
|
if(!gs || index > gs->GetRenderer().GetSwapchain().GetImagesCount())
|
||||||
return nullptr;
|
return VK_NULL_HANDLE;
|
||||||
return gs->GetRenderer().GetSwapchain().GetSwapchainImages()[index].GetImageView();
|
return gs->GetRenderer().GetSwapchain().GetSwapchainImages()[index].GetImageView();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ namespace mlx
|
|||||||
|
|
||||||
void* MemManager::AlignedMalloc(std::size_t alignment, std::size_t size)
|
void* MemManager::AlignedMalloc(std::size_t alignment, std::size_t size)
|
||||||
{
|
{
|
||||||
#ifdef MLX_COMPILER_MSVC
|
#ifdef MLX_PLAT_WINDOWS
|
||||||
void* ptr = _aligned_malloc(size, alignment);
|
void* ptr = _aligned_malloc(size, alignment);
|
||||||
#else
|
#else
|
||||||
if(alignment < sizeof(void*))
|
if(alignment < sizeof(void*))
|
||||||
@@ -66,7 +66,7 @@ namespace mlx
|
|||||||
{
|
{
|
||||||
auto it = std::find_if(s_blocks.begin(), s_blocks.end(), [=](const Descriptor& rhs){ return ptr == rhs.ptr; });
|
auto it = std::find_if(s_blocks.begin(), s_blocks.end(), [=](const Descriptor& rhs){ return ptr == rhs.ptr; });
|
||||||
|
|
||||||
#ifdef MLX_COMPILER_MSVC
|
#ifdef MLX_PLAT_WINDOWS
|
||||||
void* ptr2 = _aligned_realloc(ptr, size, alignment);
|
void* ptr2 = _aligned_realloc(ptr, size, alignment);
|
||||||
if(it != s_blocks.end())
|
if(it != s_blocks.end())
|
||||||
s_blocks.erase(it);
|
s_blocks.erase(it);
|
||||||
@@ -90,7 +90,7 @@ namespace mlx
|
|||||||
auto it = std::find_if(s_blocks.begin(), s_blocks.end(), [=](const Descriptor& rhs){ return ptr == rhs.ptr; });
|
auto it = std::find_if(s_blocks.begin(), s_blocks.end(), [=](const Descriptor& rhs){ return ptr == rhs.ptr; });
|
||||||
if(it == s_blocks.end())
|
if(it == s_blocks.end())
|
||||||
return;
|
return;
|
||||||
#ifdef MLX_COMPILER_MSVC
|
#ifdef MLX_PLAT_WINDOWS
|
||||||
if(it->aligned)
|
if(it->aligned)
|
||||||
_aligned_free(it->ptr);
|
_aligned_free(it->ptr);
|
||||||
else
|
else
|
||||||
@@ -105,7 +105,7 @@ namespace mlx
|
|||||||
{
|
{
|
||||||
for(const Descriptor& desc : s_blocks)
|
for(const Descriptor& desc : s_blocks)
|
||||||
{
|
{
|
||||||
#ifdef MLX_COMPILER_MSVC
|
#ifdef MLX_PLAT_WINDOWS
|
||||||
if(desc.aligned)
|
if(desc.aligned)
|
||||||
_aligned_free(desc.ptr);
|
_aligned_free(desc.ptr);
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ namespace mlx
|
|||||||
|
|
||||||
void Profiler::BeginRuntimeSession()
|
void Profiler::BeginRuntimeSession()
|
||||||
{
|
{
|
||||||
std::lock_guard lock(m_mutex);
|
|
||||||
if(m_runtime_session_began)
|
if(m_runtime_session_began)
|
||||||
return;
|
return;
|
||||||
m_output_stream.open("./runtime_profile.mlx.json", std::ofstream::out | std::ofstream::trunc);
|
m_output_stream.open("./runtime_profile.mlx.json", std::ofstream::out | std::ofstream::trunc);
|
||||||
@@ -22,7 +21,6 @@ namespace mlx
|
|||||||
|
|
||||||
void Profiler::AppendProfileData(ProfileResult&& result)
|
void Profiler::AppendProfileData(ProfileResult&& result)
|
||||||
{
|
{
|
||||||
std::lock_guard lock(m_mutex);
|
|
||||||
auto it = m_profile_data.find(result.name);
|
auto it = m_profile_data.find(result.name);
|
||||||
if(it != m_profile_data.end())
|
if(it != m_profile_data.end())
|
||||||
{
|
{
|
||||||
@@ -49,7 +47,6 @@ namespace mlx
|
|||||||
|
|
||||||
void Profiler::EndRuntimeSession()
|
void Profiler::EndRuntimeSession()
|
||||||
{
|
{
|
||||||
std::lock_guard lock(m_mutex);
|
|
||||||
if(!m_runtime_session_began)
|
if(!m_runtime_session_began)
|
||||||
return;
|
return;
|
||||||
for(auto& [_, pair] : m_profile_data)
|
for(auto& [_, pair] : m_profile_data)
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ namespace mlx
|
|||||||
m_drop_sdl_responsability = SDL_WasInit(SDL_INIT_VIDEO) || std::getenv("MLX_HEADLESS_MODE") != nullptr;
|
m_drop_sdl_responsability = SDL_WasInit(SDL_INIT_VIDEO) || std::getenv("MLX_HEADLESS_MODE") != nullptr;
|
||||||
if(m_drop_sdl_responsability) // is case the mlx is running in a sandbox like MacroUnitTester where SDL is already init
|
if(m_drop_sdl_responsability) // is case the mlx is running in a sandbox like MacroUnitTester where SDL is already init
|
||||||
return;
|
return;
|
||||||
SDL_SetMemoryFunctions(MemManager::Get().Malloc, MemManager::Get().Calloc, MemManager::Get().Realloc, MemManager::Get().Free);
|
//SDL_SetMemoryFunctions(MemManager::Get().Malloc, MemManager::Get().Calloc, MemManager::Get().Realloc, MemManager::Get().Free);
|
||||||
|
|
||||||
#ifdef FORCE_WAYLAND
|
#ifdef FORCE_WAYLAND
|
||||||
SDL_SetHint(SDL_HINT_VIDEODRIVER, "wayland,x11");
|
SDL_SetHint(SDL_HINT_VIDEODRIVER, "wayland,x11");
|
||||||
@@ -43,7 +43,7 @@ namespace mlx
|
|||||||
Internal::WindowInfos* infos = new Internal::WindowInfos;
|
Internal::WindowInfos* infos = new Internal::WindowInfos;
|
||||||
Verify(infos != nullptr, "SDL: window allocation failed");
|
Verify(infos != nullptr, "SDL: window allocation failed");
|
||||||
|
|
||||||
std::uint32_t flags = SDL_WINDOW_VULKAN;
|
std::uint32_t flags = 0;
|
||||||
if(hidden)
|
if(hidden)
|
||||||
flags |= SDL_WINDOW_HIDDEN;
|
flags |= SDL_WINDOW_HIDDEN;
|
||||||
else
|
else
|
||||||
@@ -88,28 +88,38 @@ namespace mlx
|
|||||||
|
|
||||||
VkSurfaceKHR SDLManager::CreateVulkanSurface(Handle window, VkInstance instance) const noexcept
|
VkSurfaceKHR SDLManager::CreateVulkanSurface(Handle window, VkInstance instance) const noexcept
|
||||||
{
|
{
|
||||||
VkSurfaceKHR surface;
|
SDL_SysWMinfo info;
|
||||||
if(!SDL_Vulkan_CreateSurface(static_cast<Internal::WindowInfos*>(window)->window, instance, &surface))
|
SDL_VERSION(&info.version);
|
||||||
FatalError("SDL: could not create a Vulkan surface; %", SDL_GetError());
|
if(SDL_GetWindowWMInfo(static_cast<Internal::WindowInfos*>(window)->window, &info) != SDL_TRUE)
|
||||||
return surface;
|
FatalError("SDL Manager: cannot retrieve window informations");
|
||||||
}
|
|
||||||
|
|
||||||
std::vector<const char*> SDLManager::GetRequiredVulkanInstanceExtentions(Handle window) const noexcept
|
switch(info.subsystem)
|
||||||
{
|
{
|
||||||
std::uint32_t count;
|
#ifdef SDL_VIDEO_DRIVER_WINDOWS
|
||||||
if(!SDL_Vulkan_GetInstanceExtensions(static_cast<Internal::WindowInfos*>(window)->window, &count, nullptr))
|
case SDL_SYSWM_WINDOWS: return kvfCreateSurfaceKHR(instance, KVF_SURFACE_WINDOWS, static_cast<void*>(info.info.win.hinstance), static_cast<void*>(info.info.win.window));
|
||||||
FatalError("SDL Manager: could not retrieve Vulkan instance extensions");
|
#endif
|
||||||
std::vector<const char*> extensions(count);
|
#ifdef SDL_VIDEO_DRIVER_X11
|
||||||
if(!SDL_Vulkan_GetInstanceExtensions(static_cast<Internal::WindowInfos*>(window)->window, &count, extensions.data()))
|
case SDL_SYSWM_X11: return kvfCreateSurfaceKHR(instance, KVF_SURFACE_XLIB, static_cast<void*>(info.info.x11.display), static_cast<void*>(&info.info.x11.window));
|
||||||
FatalError("SDL Manager: could not retrieve Vulkan instance extensions");
|
#endif
|
||||||
extensions.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
|
#ifdef SDL_VIDEO_DRIVER_COCOA
|
||||||
return extensions;
|
case SDL_SYSWM_COCOA: FatalError("SDL Manager: Vulkan surfaces over Metal are not supported yet. Please fill an issue here https://github.com/seekrs/MacroLibX/issues/new");
|
||||||
|
#endif
|
||||||
|
#ifdef SDL_VIDEO_DRIVER_WAYLAND
|
||||||
|
case SDL_SYSWM_WAYLAND: return kvfCreateSurfaceKHR(instance, KVF_SURFACE_WAYLAND, static_cast<void*>(info.info.wl.display), static_cast<void*>(info.info.wl.surface));
|
||||||
|
#endif
|
||||||
|
#ifdef SDL_VIDEO_DRIVER_ANDROID
|
||||||
|
case SDL_SYSWM_ANDROID: return kvfCreateSurfaceKHR(instance, KVF_SURFACE_ANDROID, nullptr, static_cast<void*>(info.info.android.window));
|
||||||
|
#endif
|
||||||
|
|
||||||
|
default : FatalError("SDL Manager: unsupported windowing system"); break;
|
||||||
|
}
|
||||||
|
return VK_NULL_HANDLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
Vec2ui SDLManager::GetVulkanDrawableSize(Handle window) const noexcept
|
Vec2ui SDLManager::GetVulkanDrawableSize(Handle window) const noexcept
|
||||||
{
|
{
|
||||||
Vec2i extent;
|
Vec2i extent;
|
||||||
SDL_Vulkan_GetDrawableSize(static_cast<Internal::WindowInfos*>(window)->window, &extent.x, &extent.y);
|
SDL_GetWindowSize(static_cast<Internal::WindowInfos*>(window)->window, &extent.x, &extent.y);
|
||||||
return Vec2ui{ extent };
|
return Vec2ui{ extent };
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -266,6 +276,7 @@ namespace mlx
|
|||||||
case SDL_WINDOWEVENT_LEAVE: functor(MLX_WINDOW_EVENT, id, 6); break;
|
case SDL_WINDOWEVENT_LEAVE: functor(MLX_WINDOW_EVENT, id, 6); break;
|
||||||
case SDL_WINDOWEVENT_FOCUS_LOST: functor(MLX_WINDOW_EVENT, id, 7); break;
|
case SDL_WINDOWEVENT_FOCUS_LOST: functor(MLX_WINDOW_EVENT, id, 7); break;
|
||||||
case SDL_WINDOWEVENT_SIZE_CHANGED: functor(MLX_WINDOW_EVENT, id, 8); break;
|
case SDL_WINDOWEVENT_SIZE_CHANGED: functor(MLX_WINDOW_EVENT, id, 8); break;
|
||||||
|
case SDL_WINDOWEVENT_RESTORED: functor(MLX_WINDOW_EVENT, id, 11); break;
|
||||||
|
|
||||||
default : break;
|
default : break;
|
||||||
}
|
}
|
||||||
@@ -284,6 +295,7 @@ namespace mlx
|
|||||||
{
|
{
|
||||||
if(m_drop_sdl_responsability)
|
if(m_drop_sdl_responsability)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_EVENTS);
|
SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_EVENTS);
|
||||||
SDL_Quit();
|
SDL_Quit();
|
||||||
s_instance = nullptr;
|
s_instance = nullptr;
|
||||||
|
|||||||
@@ -6,6 +6,29 @@
|
|||||||
|
|
||||||
namespace mlx
|
namespace mlx
|
||||||
{
|
{
|
||||||
|
PutPixelManager::PutPixelManager(NonOwningPtr<class Renderer> renderer) : p_renderer(renderer)
|
||||||
|
{
|
||||||
|
MLX_PROFILE_FUNCTION();
|
||||||
|
std::function<void(const EventBase&)> functor = [this](const EventBase& event)
|
||||||
|
{
|
||||||
|
// Suboptimal for multi-windows applications
|
||||||
|
if(event.What() == Event::ResizeEventCode)
|
||||||
|
{
|
||||||
|
VkExtent2D extent{ .width = 0, .height = 0 };
|
||||||
|
if(p_renderer->GetWindow())
|
||||||
|
extent = kvfGetSwapchainImagesSize(p_renderer->GetSwapchain().Get());
|
||||||
|
else if(p_renderer->GetRenderTarget())
|
||||||
|
extent = VkExtent2D{ .width = p_renderer->GetRenderTarget()->GetWidth(), .height = p_renderer->GetRenderTarget()->GetHeight() };
|
||||||
|
else
|
||||||
|
FatalError("a renderer was created without window nor render target attached (wtf!?)");
|
||||||
|
|
||||||
|
for(auto& texture : m_textures)
|
||||||
|
texture->Resize(extent.width, extent.height);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
EventBus::RegisterListener({ functor, "mlx_put_pixel_manager_" + std::to_string(reinterpret_cast<std::uintptr_t>(this)) });
|
||||||
|
}
|
||||||
|
|
||||||
NonOwningPtr<Texture> PutPixelManager::DrawPixel(int x, int y, std::uint64_t draw_layer, mlx_color color)
|
NonOwningPtr<Texture> PutPixelManager::DrawPixel(int x, int y, std::uint64_t draw_layer, mlx_color color)
|
||||||
{
|
{
|
||||||
MLX_PROFILE_FUNCTION();
|
MLX_PROFILE_FUNCTION();
|
||||||
@@ -53,21 +76,8 @@ namespace mlx
|
|||||||
is_newlayer = true;
|
is_newlayer = true;
|
||||||
|
|
||||||
if(m_current_texture_index >= m_textures.size())
|
if(m_current_texture_index >= m_textures.size())
|
||||||
{
|
m_textures.push_back(NewTexture());
|
||||||
VkExtent2D extent{ .width = 0, .height = 0 };
|
|
||||||
if(p_renderer->GetWindow())
|
|
||||||
extent = kvfGetSwapchainImagesSize(p_renderer->GetSwapchain().Get());
|
|
||||||
else if(p_renderer->GetRenderTarget())
|
|
||||||
extent = VkExtent2D{ .width = p_renderer->GetRenderTarget()->GetWidth(), .height = p_renderer->GetRenderTarget()->GetHeight() };
|
|
||||||
else
|
|
||||||
FatalError("a renderer was created without window nor render target attached (wtf)");
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
|
||||||
m_textures.push_back(std::make_unique<Texture>(CPUBuffer{}, extent.width, extent.height, VK_FORMAT_R8G8B8A8_SRGB, false, "mlx_put_pixel_layer_" + std::to_string(m_current_texture_index)));
|
|
||||||
#else
|
|
||||||
m_textures.push_back(std::make_unique<Texture>(CPUBuffer{}, extent.width, extent.height, VK_FORMAT_R8G8B8A8_SRGB, false, std::string_view{}));
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
m_placements[draw_layer] = m_textures.at(m_current_texture_index).get();
|
m_placements[draw_layer] = m_textures.at(m_current_texture_index).get();
|
||||||
@@ -83,6 +93,23 @@ namespace mlx
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<Texture> PutPixelManager::NewTexture()
|
||||||
|
{
|
||||||
|
VkExtent2D extent{ .width = 0, .height = 0 };
|
||||||
|
if(p_renderer->GetWindow())
|
||||||
|
extent = kvfGetSwapchainImagesSize(p_renderer->GetSwapchain().Get());
|
||||||
|
else if(p_renderer->GetRenderTarget())
|
||||||
|
extent = VkExtent2D{ .width = p_renderer->GetRenderTarget()->GetWidth(), .height = p_renderer->GetRenderTarget()->GetHeight() };
|
||||||
|
else
|
||||||
|
FatalError("a renderer was created without window nor render target attached (wtf!?)");
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
return std::make_unique<Texture>(CPUBuffer{}, extent.width, extent.height, VK_FORMAT_R8G8B8A8_SRGB, false, "mlx_put_pixel_layer_" + std::to_string(m_current_texture_index));
|
||||||
|
#else
|
||||||
|
return std::make_unique<Texture>(CPUBuffer{}, extent.width, extent.height, VK_FORMAT_R8G8B8A8_SRGB, false, std::string_view{});
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
void PutPixelManager::ResetRenderData()
|
void PutPixelManager::ResetRenderData()
|
||||||
{
|
{
|
||||||
m_placements.clear();
|
m_placements.clear();
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
namespace mlx
|
namespace mlx
|
||||||
{
|
{
|
||||||
constexpr std::size_t MAX_SETS_PER_POOL = MAX_FRAMES_IN_FLIGHT * 1024;
|
constexpr std::size_t MAX_SETS_PER_POOL = 1024;
|
||||||
|
|
||||||
void TransitionImageToCorrectLayout(Image& image, VkCommandBuffer cmd)
|
void TransitionImageToCorrectLayout(Image& image, VkCommandBuffer cmd)
|
||||||
{
|
{
|
||||||
@@ -26,19 +26,19 @@ namespace mlx
|
|||||||
{
|
{
|
||||||
MLX_PROFILE_FUNCTION();
|
MLX_PROFILE_FUNCTION();
|
||||||
VkDescriptorPoolSize pool_sizes[] = {
|
VkDescriptorPoolSize pool_sizes[] = {
|
||||||
{ VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, MAX_SETS_PER_POOL },
|
{ VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, MAX_FRAMES_IN_FLIGHT * MAX_SETS_PER_POOL },
|
||||||
{ VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, MAX_SETS_PER_POOL },
|
{ VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, MAX_FRAMES_IN_FLIGHT * MAX_SETS_PER_POOL },
|
||||||
{ VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, MAX_SETS_PER_POOL }
|
{ VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, MAX_FRAMES_IN_FLIGHT * MAX_SETS_PER_POOL }
|
||||||
};
|
};
|
||||||
|
|
||||||
VkDescriptorPoolCreateInfo pool_info{};
|
VkDescriptorPoolCreateInfo pool_info{};
|
||||||
pool_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
|
pool_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
|
||||||
pool_info.poolSizeCount = sizeof(pool_sizes) / sizeof(pool_sizes[0]);
|
pool_info.poolSizeCount = sizeof(pool_sizes) / sizeof(pool_sizes[0]);
|
||||||
pool_info.pPoolSizes = pool_sizes;
|
pool_info.pPoolSizes = pool_sizes;
|
||||||
pool_info.maxSets = MAX_SETS_PER_POOL;
|
pool_info.maxSets = MAX_FRAMES_IN_FLIGHT * MAX_SETS_PER_POOL;
|
||||||
pool_info.flags = 0;
|
pool_info.flags = 0;
|
||||||
kvfCheckVk(RenderCore::Get().vkCreateDescriptorPool(RenderCore::Get().GetDevice(), &pool_info, nullptr, &m_pool));
|
kvfCheckVk(RenderCore::Get().vkCreateDescriptorPool(RenderCore::Get().GetDevice(), &pool_info, nullptr, &m_pool));
|
||||||
m_allocation_count = 0;
|
DebugLog("Vulkan: created new descriptor pool");
|
||||||
}
|
}
|
||||||
|
|
||||||
void DescriptorPool::Destroy() noexcept
|
void DescriptorPool::Destroy() noexcept
|
||||||
@@ -52,7 +52,6 @@ namespace mlx
|
|||||||
kvfDestroyDescriptorSetLayout(RenderCore::Get().GetDevice(), set->m_set_layout);
|
kvfDestroyDescriptorSetLayout(RenderCore::Get().GetDevice(), set->m_set_layout);
|
||||||
RenderCore::Get().vkDestroyDescriptorPool(RenderCore::Get().GetDevice(), m_pool, nullptr);
|
RenderCore::Get().vkDestroyDescriptorPool(RenderCore::Get().GetDevice(), m_pool, nullptr);
|
||||||
m_pool = VK_NULL_HANDLE;
|
m_pool = VK_NULL_HANDLE;
|
||||||
m_allocation_count = 0;
|
|
||||||
m_free_sets.clear();
|
m_free_sets.clear();
|
||||||
m_used_sets.clear();
|
m_used_sets.clear();
|
||||||
}
|
}
|
||||||
@@ -103,7 +102,6 @@ namespace mlx
|
|||||||
alloc_info.pSetLayouts = &vulkan_layout;
|
alloc_info.pSetLayouts = &vulkan_layout;
|
||||||
VkDescriptorSet vulkan_set;
|
VkDescriptorSet vulkan_set;
|
||||||
kvfCheckVk(RenderCore::Get().vkAllocateDescriptorSets(RenderCore::Get().GetDevice(), &alloc_info, &vulkan_set));
|
kvfCheckVk(RenderCore::Get().vkAllocateDescriptorSets(RenderCore::Get().GetDevice(), &alloc_info, &vulkan_set));
|
||||||
m_allocation_count++;
|
|
||||||
vulkan_sets[i] = vulkan_set;
|
vulkan_sets[i] = vulkan_set;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,11 +112,8 @@ namespace mlx
|
|||||||
|
|
||||||
void DescriptorPool::ReturnDescriptorSet(std::shared_ptr<DescriptorSet> set)
|
void DescriptorPool::ReturnDescriptorSet(std::shared_ptr<DescriptorSet> set)
|
||||||
{
|
{
|
||||||
//std::size_t i = 0;
|
|
||||||
auto it = std::find_if(m_used_sets.begin(), m_used_sets.end(), [&](const std::shared_ptr<DescriptorSet>& rhs_set)
|
auto it = std::find_if(m_used_sets.begin(), m_used_sets.end(), [&](const std::shared_ptr<DescriptorSet>& rhs_set)
|
||||||
{
|
{
|
||||||
//i++;
|
|
||||||
//std::cout << m_used_sets.size() << " " << i << std::endl;
|
|
||||||
return set == rhs_set;
|
return set == rhs_set;
|
||||||
});
|
});
|
||||||
if(it == m_used_sets.end())
|
if(it == m_used_sets.end())
|
||||||
@@ -127,23 +122,34 @@ namespace mlx
|
|||||||
m_free_sets.push_back(set);
|
m_free_sets.push_back(set);
|
||||||
}
|
}
|
||||||
|
|
||||||
DescriptorPool& DescriptorPoolManager::GetAvailablePool()
|
bool DescriptorPool::CanAllocate(const ShaderSetLayout& layout, ShaderType shader_type) const
|
||||||
|
{
|
||||||
|
auto it = std::find_if(m_free_sets.begin(), m_free_sets.end(), [&](std::shared_ptr<DescriptorSet> set)
|
||||||
|
{
|
||||||
|
return shader_type == set->GetShaderType() && layout == set->GetShaderLayout();
|
||||||
|
});
|
||||||
|
if(it != m_free_sets.end())
|
||||||
|
return true;
|
||||||
|
return m_used_sets.size() + m_free_sets.size() < MAX_SETS_PER_POOL;
|
||||||
|
}
|
||||||
|
|
||||||
|
DescriptorPool& DescriptorPoolManager::GetAvailablePool(const ShaderSetLayout& layout, ShaderType shader_type)
|
||||||
{
|
{
|
||||||
MLX_PROFILE_FUNCTION();
|
MLX_PROFILE_FUNCTION();
|
||||||
for(auto& pool : m_pools)
|
for(auto& pool : m_pools)
|
||||||
{
|
{
|
||||||
if(pool.GetNumberOfSetsAllocated() < MAX_SETS_PER_POOL)
|
if(pool->CanAllocate(layout, shader_type))
|
||||||
return pool;
|
return *pool;
|
||||||
}
|
}
|
||||||
m_pools.emplace_back().Init();
|
m_pools.emplace_back(std::make_unique<DescriptorPool>())->Init();
|
||||||
return m_pools.back();
|
return *m_pools.back();
|
||||||
}
|
}
|
||||||
|
|
||||||
void DescriptorPoolManager::Destroy()
|
void DescriptorPoolManager::Destroy()
|
||||||
{
|
{
|
||||||
MLX_PROFILE_FUNCTION();
|
MLX_PROFILE_FUNCTION();
|
||||||
for(auto& pool : m_pools)
|
for(auto& pool : m_pools)
|
||||||
pool.Destroy();
|
pool->Destroy();
|
||||||
m_pools.clear();
|
m_pools.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,15 +22,9 @@
|
|||||||
#include <stb_image.h>
|
#include <stb_image.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef IMAGE_OPTIMIZED
|
|
||||||
#define TILING VK_IMAGE_TILING_OPTIMAL
|
|
||||||
#else
|
|
||||||
#define TILING VK_IMAGE_TILING_LINEAR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace mlx
|
namespace mlx
|
||||||
{
|
{
|
||||||
mlx_color ReverseColor(mlx_color color)
|
MLX_FORCEINLINE mlx_color ReverseColor(mlx_color color)
|
||||||
{
|
{
|
||||||
mlx_color reversed_color;
|
mlx_color reversed_color;
|
||||||
reversed_color.r = color.a;
|
reversed_color.r = color.a;
|
||||||
@@ -186,7 +180,7 @@ namespace mlx
|
|||||||
void Texture::Init(CPUBuffer pixels, std::uint32_t width, std::uint32_t height, VkFormat format, bool is_multisampled, [[maybe_unused]] std::string_view debug_name)
|
void Texture::Init(CPUBuffer pixels, std::uint32_t width, std::uint32_t height, VkFormat format, bool is_multisampled, [[maybe_unused]] std::string_view debug_name)
|
||||||
{
|
{
|
||||||
MLX_PROFILE_FUNCTION();
|
MLX_PROFILE_FUNCTION();
|
||||||
Image::Init(ImageType::Color, width, height, format, TILING, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, is_multisampled, std::move(debug_name));
|
Image::Init(ImageType::Color, width, height, format, VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, is_multisampled, std::move(debug_name));
|
||||||
Image::CreateImageView(VK_IMAGE_VIEW_TYPE_2D, VK_IMAGE_ASPECT_COLOR_BIT);
|
Image::CreateImageView(VK_IMAGE_VIEW_TYPE_2D, VK_IMAGE_ASPECT_COLOR_BIT);
|
||||||
Image::CreateSampler();
|
Image::CreateSampler();
|
||||||
if(pixels)
|
if(pixels)
|
||||||
@@ -368,8 +362,16 @@ namespace mlx
|
|||||||
m_staging_buffer->Init(BufferType::Staging, size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT, {}, {});
|
m_staging_buffer->Init(BufferType::Staging, size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT, {}, {});
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
SyncCPUBuffer();
|
||||||
|
}
|
||||||
|
|
||||||
|
void Texture::SyncCPUBuffer(VkCommandBuffer cmd)
|
||||||
|
{
|
||||||
|
if(!m_staging_buffer.has_value())
|
||||||
|
return;
|
||||||
VkImageLayout old_layout = m_layout;
|
VkImageLayout old_layout = m_layout;
|
||||||
VkCommandBuffer cmd = kvfCreateCommandBuffer(RenderCore::Get().GetDevice());
|
if(cmd == VK_NULL_HANDLE)
|
||||||
|
cmd = kvfCreateCommandBuffer(RenderCore::Get().GetDevice());
|
||||||
kvfBeginCommandBuffer(cmd, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT);
|
kvfBeginCommandBuffer(cmd, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT);
|
||||||
TransitionLayout(VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, cmd);
|
TransitionLayout(VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, cmd);
|
||||||
kvfCopyImageToBuffer(cmd, m_staging_buffer->Get(), m_image, m_staging_buffer->GetOffset(), VK_IMAGE_ASPECT_COLOR_BIT, { m_width, m_height, 1 });
|
kvfCopyImageToBuffer(cmd, m_staging_buffer->Get(), m_image, m_staging_buffer->GetOffset(), VK_IMAGE_ASPECT_COLOR_BIT, { m_width, m_height, 1 });
|
||||||
@@ -381,6 +383,105 @@ namespace mlx
|
|||||||
kvfDestroyCommandBuffer(RenderCore::Get().GetDevice(), cmd);
|
kvfDestroyCommandBuffer(RenderCore::Get().GetDevice(), cmd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Texture::CopyTo(Texture& other)
|
||||||
|
{
|
||||||
|
VkImageLayout old_layout = m_layout;
|
||||||
|
VkImageLayout other_old_layout = other.GetLayout();
|
||||||
|
|
||||||
|
VkImageSubresourceLayers subresource{};
|
||||||
|
subresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
|
||||||
|
subresource.mipLevel = 0;
|
||||||
|
subresource.layerCount = 1;
|
||||||
|
subresource.baseArrayLayer = 0;
|
||||||
|
|
||||||
|
VkExtent3D extent{};
|
||||||
|
extent.width = m_width;
|
||||||
|
extent.height = m_height;
|
||||||
|
extent.depth = 1;
|
||||||
|
|
||||||
|
VkOffset3D offset{};
|
||||||
|
offset.x = 0;
|
||||||
|
offset.y = 0;
|
||||||
|
offset.z = 0;
|
||||||
|
|
||||||
|
VkImageCopy region{};
|
||||||
|
region.srcSubresource = subresource;
|
||||||
|
region.dstSubresource = subresource;
|
||||||
|
region.extent = extent;
|
||||||
|
region.srcOffset = offset;
|
||||||
|
region.dstOffset = offset;
|
||||||
|
|
||||||
|
VkCommandBuffer cmd = kvfCreateCommandBuffer(RenderCore::Get().GetDevice());
|
||||||
|
kvfBeginCommandBuffer(cmd, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT);
|
||||||
|
|
||||||
|
TransitionLayout(VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, cmd);
|
||||||
|
other.TransitionLayout(VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, cmd);
|
||||||
|
|
||||||
|
kvfCopyImageToImage(cmd, m_image, m_layout, other.Get(), other.GetLayout(), 1, ®ion);
|
||||||
|
|
||||||
|
TransitionLayout(old_layout, cmd);
|
||||||
|
other.TransitionLayout(other_old_layout, cmd);
|
||||||
|
|
||||||
|
kvfEndCommandBuffer(cmd);
|
||||||
|
|
||||||
|
SyncCPUBuffer(cmd);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Texture::Resize(std::uint32_t width, std::uint32_t height)
|
||||||
|
{
|
||||||
|
#ifdef DEBUG
|
||||||
|
Texture new_texture = Texture(CPUBuffer{}, width, height, m_format, m_is_multisampled, m_debug_name);
|
||||||
|
#else
|
||||||
|
Texture new_texture = Texture(CPUBuffer{}, width, height, m_format, m_is_multisampled, std::string_view{});
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if(m_staging_buffer.has_value())
|
||||||
|
{
|
||||||
|
new_texture.OpenCPUBuffer();
|
||||||
|
new_texture.m_staging_buffer->CopyFrom(*m_staging_buffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Suboptimal operations, should bake all of them in a single command buffer
|
||||||
|
new_texture.Clear(VK_NULL_HANDLE, Vec4f{ 0.f });
|
||||||
|
CopyTo(new_texture);
|
||||||
|
|
||||||
|
Swap(new_texture);
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
DebugLog("Texture: resized '%'", m_debug_name);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void Texture::Swap(Texture& texture) noexcept
|
||||||
|
{
|
||||||
|
MLX_PROFILE_FUNCTION();
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
std::swap(m_debug_name, texture.m_debug_name);
|
||||||
|
#endif
|
||||||
|
std::swap(m_allocation, texture.m_allocation);
|
||||||
|
std::swap(m_image, texture.m_image);
|
||||||
|
std::swap(m_image_view, texture.m_image_view);
|
||||||
|
std::swap(m_sampler, texture.m_sampler);
|
||||||
|
std::swap(m_format, texture.m_format);
|
||||||
|
std::swap(m_tiling, texture.m_tiling);
|
||||||
|
std::swap(m_layout, texture.m_layout);
|
||||||
|
std::swap(m_type, texture.m_type);
|
||||||
|
std::swap(m_width, texture.m_width);
|
||||||
|
std::swap(m_height, texture.m_height);
|
||||||
|
std::swap(m_is_multisampled, texture.m_is_multisampled);
|
||||||
|
|
||||||
|
if(m_staging_buffer.has_value() && texture.m_staging_buffer.has_value())
|
||||||
|
m_staging_buffer->Swap(*texture.m_staging_buffer);
|
||||||
|
else if(m_staging_buffer.has_value())
|
||||||
|
m_staging_buffer.reset();
|
||||||
|
else if(texture.m_staging_buffer.has_value())
|
||||||
|
texture.m_staging_buffer.reset();
|
||||||
|
|
||||||
|
m_has_been_modified = true;
|
||||||
|
texture.m_has_been_modified = true;
|
||||||
|
}
|
||||||
|
|
||||||
Texture* StbTextureLoad(const std::filesystem::path& file, int* w, int* h)
|
Texture* StbTextureLoad(const std::filesystem::path& file, int* w, int* h)
|
||||||
{
|
{
|
||||||
using namespace std::literals;
|
using namespace std::literals;
|
||||||
|
|||||||
@@ -127,6 +127,9 @@ namespace mlx
|
|||||||
void GraphicPipeline::Destroy() noexcept
|
void GraphicPipeline::Destroy() noexcept
|
||||||
{
|
{
|
||||||
MLX_PROFILE_FUNCTION();
|
MLX_PROFILE_FUNCTION();
|
||||||
|
if(m_pipeline == VK_NULL_HANDLE)
|
||||||
|
return;
|
||||||
|
|
||||||
p_vertex_shader.reset();
|
p_vertex_shader.reset();
|
||||||
p_fragment_shader.reset();
|
p_fragment_shader.reset();
|
||||||
for(auto fb : m_framebuffers)
|
for(auto fb : m_framebuffers)
|
||||||
|
|||||||
@@ -55,17 +55,17 @@ namespace mlx
|
|||||||
std::cout << std::endl;
|
std::cout << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
void* VulkanAllocationFunction(void*, std::size_t size, std::size_t alignment, VkSystemAllocationScope)
|
void* VKAPI_PTR VulkanAllocationFunction(void*, std::size_t size, std::size_t alignment, VkSystemAllocationScope)
|
||||||
{
|
{
|
||||||
return MemManager::AlignedMalloc(alignment, size);
|
return MemManager::AlignedMalloc(alignment, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
void* VulkanReallocationFunction(void*, void* ptr, std::size_t size, std::size_t alignment, VkSystemAllocationScope)
|
void* VKAPI_PTR VulkanReallocationFunction(void*, void* ptr, std::size_t size, std::size_t alignment, VkSystemAllocationScope)
|
||||||
{
|
{
|
||||||
return MemManager::AlignedRealloc(ptr, alignment, size);
|
return MemManager::AlignedRealloc(ptr, alignment, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
void VulkanFreeFunction(void*, void* ptr)
|
void VKAPI_PTR VulkanFreeFunction(void*, void* ptr)
|
||||||
{
|
{
|
||||||
MemManager::Free(ptr);
|
MemManager::Free(ptr);
|
||||||
}
|
}
|
||||||
@@ -100,8 +100,25 @@ namespace mlx
|
|||||||
info.width = 1;
|
info.width = 1;
|
||||||
info.height = 1;
|
info.height = 1;
|
||||||
window = std::make_unique<Window>(&info, true);
|
window = std::make_unique<Window>(&info, true);
|
||||||
instance_extensions = window->GetRequiredVulkanInstanceExtentions();
|
instance_extensions.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
|
||||||
#ifdef MLX_PLAT_MACOS
|
#ifdef VK_USE_PLATFORM_XCB_KHR
|
||||||
|
instance_extensions.push_back(VK_KHR_XCB_SURFACE_EXTENSION_NAME);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_XLIB_KHR
|
||||||
|
instance_extensions.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_WAYLAND_KHR
|
||||||
|
instance_extensions.push_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_WIN32_KHR
|
||||||
|
instance_extensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_METAL_EXT
|
||||||
|
instance_extensions.push_back(VK_EXT_METAL_SURFACE_EXTENSION_NAME);
|
||||||
instance_extensions.push_back(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME);
|
instance_extensions.push_back(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@@ -185,6 +202,41 @@ namespace mlx
|
|||||||
MLX_LOAD_FUNCTION(vkGetPhysicalDeviceSurfaceFormatsKHR);
|
MLX_LOAD_FUNCTION(vkGetPhysicalDeviceSurfaceFormatsKHR);
|
||||||
MLX_LOAD_FUNCTION(vkGetPhysicalDeviceSurfacePresentModesKHR);
|
MLX_LOAD_FUNCTION(vkGetPhysicalDeviceSurfacePresentModesKHR);
|
||||||
MLX_LOAD_FUNCTION(vkGetPhysicalDeviceSurfaceSupportKHR);
|
MLX_LOAD_FUNCTION(vkGetPhysicalDeviceSurfaceSupportKHR);
|
||||||
|
#ifdef VK_USE_PLATFORM_ANDROID_KHR
|
||||||
|
#ifdef VK_KHR_android_surface
|
||||||
|
MLX_LOAD_FUNCTION(vkCreateAndroidSurfaceKHR);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_XCB_KHR
|
||||||
|
#ifdef VK_KHR_xcb_surface
|
||||||
|
MLX_LOAD_FUNCTION(vkCreateXcbSurfaceKHR);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_XLIB_KHR
|
||||||
|
#ifdef VK_KHR_xlib_surface
|
||||||
|
MLX_LOAD_FUNCTION(vkCreateXlibSurfaceKHR);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_WAYLAND_KHR
|
||||||
|
#ifdef VK_KHR_wayland_surface
|
||||||
|
MLX_LOAD_FUNCTION(vkCreateWaylandSurfaceKHR);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_WIN32_KHR
|
||||||
|
#ifdef VK_KHR_win32_surface
|
||||||
|
MLX_LOAD_FUNCTION(vkCreateWin32SurfaceKHR);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_METAL_EXT
|
||||||
|
#ifdef VK_EXT_metal_surface
|
||||||
|
MLX_LOAD_FUNCTION(vkCreateMetalSurfaceEXT);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
kvfPassInstanceVulkanFunctionPointers(&pfns);
|
kvfPassInstanceVulkanFunctionPointers(&pfns);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -52,8 +52,8 @@ namespace mlx
|
|||||||
};
|
};
|
||||||
EventBus::RegisterListener({ functor, "mlx_2d_render_pass_" + std::to_string(reinterpret_cast<std::uintptr_t>(this)) });
|
EventBus::RegisterListener({ functor, "mlx_2d_render_pass_" + std::to_string(reinterpret_cast<std::uintptr_t>(this)) });
|
||||||
|
|
||||||
p_viewer_data_set = RenderCore::Get().GetDescriptorPoolManager().GetAvailablePool().RequestDescriptorSet(p_vertex_shader->GetShaderLayout().set_layouts[0].second, ShaderType::Vertex);
|
p_viewer_data_set = RenderCore::Get().GetDescriptorPoolManager().GetAvailablePool(p_vertex_shader->GetShaderLayout().set_layouts[0].second, ShaderType::Vertex).RequestDescriptorSet(p_vertex_shader->GetShaderLayout().set_layouts[0].second, ShaderType::Vertex);
|
||||||
p_texture_set = RenderCore::Get().GetDescriptorPoolManager().GetAvailablePool().RequestDescriptorSet(p_fragment_shader->GetShaderLayout().set_layouts[0].second, ShaderType::Fragment);
|
p_texture_set = RenderCore::Get().GetDescriptorPoolManager().GetAvailablePool(p_fragment_shader->GetShaderLayout().set_layouts[0].second, ShaderType::Fragment).RequestDescriptorSet(p_fragment_shader->GetShaderLayout().set_layouts[0].second, ShaderType::Fragment);
|
||||||
|
|
||||||
p_viewer_data_buffer = std::make_shared<UniformBuffer>();
|
p_viewer_data_buffer = std::make_shared<UniformBuffer>();
|
||||||
p_viewer_data_buffer->Init(sizeof(ViewerData), "mlx_2d_pass_viewer_data");
|
p_viewer_data_buffer->Init(sizeof(ViewerData), "mlx_2d_pass_viewer_data");
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ namespace mlx
|
|||||||
};
|
};
|
||||||
EventBus::RegisterListener({ functor, "mlx_final_pass_" + std::to_string(reinterpret_cast<std::uintptr_t>(this)) });
|
EventBus::RegisterListener({ functor, "mlx_final_pass_" + std::to_string(reinterpret_cast<std::uintptr_t>(this)) });
|
||||||
|
|
||||||
p_set = RenderCore::Get().GetDescriptorPoolManager().GetAvailablePool().RequestDescriptorSet(p_fragment_shader->GetShaderLayout().set_layouts[0].second, ShaderType::Fragment);
|
p_set = RenderCore::Get().GetDescriptorPoolManager().GetAvailablePool(p_fragment_shader->GetShaderLayout().set_layouts[0].second, ShaderType::Fragment).RequestDescriptorSet(p_fragment_shader->GetShaderLayout().set_layouts[0].second, ShaderType::Fragment);
|
||||||
}
|
}
|
||||||
|
|
||||||
void FinalPass::Pass([[maybe_unused]] Scene& scene, Renderer& renderer, Texture& render_target, NonOwningPtr<class Texture> final_target)
|
void FinalPass::Pass([[maybe_unused]] Scene& scene, Renderer& renderer, Texture& render_target, NonOwningPtr<class Texture> final_target)
|
||||||
|
|||||||
@@ -20,29 +20,42 @@ namespace mlx
|
|||||||
MLX_PROFILE_FUNCTION();
|
MLX_PROFILE_FUNCTION();
|
||||||
p_window = window;
|
p_window = window;
|
||||||
m_swapchain.Init(p_window);
|
m_swapchain.Init(p_window);
|
||||||
for(std::size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++)
|
Init(NonOwningPtr<Texture>{ nullptr });
|
||||||
{
|
|
||||||
m_image_available_semaphores[i] = kvfCreateSemaphore(RenderCore::Get().GetDevice());
|
|
||||||
DebugLog("Vulkan: image available semaphore created");
|
|
||||||
m_render_finished_semaphores[i] = kvfCreateSemaphore(RenderCore::Get().GetDevice());
|
|
||||||
DebugLog("Vulkan: render finished semaphore created");
|
|
||||||
m_cmd_buffers[i] = kvfCreateCommandBuffer(RenderCore::Get().GetDevice());
|
|
||||||
DebugLog("Vulkan: command buffer created");
|
|
||||||
m_cmd_fences[i] = kvfCreateFence(RenderCore::Get().GetDevice());
|
|
||||||
DebugLog("Vulkan: fence created");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Renderer::Init(NonOwningPtr<Texture> render_target)
|
void Renderer::Init(NonOwningPtr<Texture> render_target)
|
||||||
{
|
{
|
||||||
MLX_PROFILE_FUNCTION();
|
MLX_PROFILE_FUNCTION();
|
||||||
|
std::function<void(const EventBase&)> functor = [this](const EventBase& event)
|
||||||
|
{
|
||||||
|
if(event.What() == Event::ResizeEventCode)
|
||||||
|
{
|
||||||
|
for(std::size_t i = 0; i < m_render_finished_semaphores.size(); i++)
|
||||||
|
{
|
||||||
|
kvfDestroySemaphore(RenderCore::Get().GetDevice(), m_render_finished_semaphores[i]);
|
||||||
|
DebugLog("Vulkan: render finished semaphore destroyed");
|
||||||
|
}
|
||||||
|
m_render_finished_semaphores.clear();
|
||||||
|
for(std::size_t i = 0; i < (p_window ? m_swapchain.GetImagesCount() : 1); i++)
|
||||||
|
{
|
||||||
|
m_render_finished_semaphores.push_back(kvfCreateSemaphore(RenderCore::Get().GetDevice()));
|
||||||
|
DebugLog("Vulkan: render finished semaphore created");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
EventBus::RegisterListener({ functor, "mlx_renderer_" + std::to_string(reinterpret_cast<std::uintptr_t>(this)) });
|
||||||
|
|
||||||
|
if(render_target)
|
||||||
p_render_target = render_target;
|
p_render_target = render_target;
|
||||||
|
for(std::size_t i = 0; i < (p_window ? m_swapchain.GetImagesCount() : 1); i++)
|
||||||
|
{
|
||||||
|
m_render_finished_semaphores.push_back(kvfCreateSemaphore(RenderCore::Get().GetDevice()));
|
||||||
|
DebugLog("Vulkan: render finished semaphore created");
|
||||||
|
}
|
||||||
for(std::size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++)
|
for(std::size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++)
|
||||||
{
|
{
|
||||||
m_image_available_semaphores[i] = kvfCreateSemaphore(RenderCore::Get().GetDevice());
|
m_image_available_semaphores[i] = kvfCreateSemaphore(RenderCore::Get().GetDevice());
|
||||||
DebugLog("Vulkan: image available semaphore created");
|
DebugLog("Vulkan: image available semaphore created");
|
||||||
m_render_finished_semaphores[i] = kvfCreateSemaphore(RenderCore::Get().GetDevice());
|
|
||||||
DebugLog("Vulkan: render finished semaphore created");
|
|
||||||
m_cmd_buffers[i] = kvfCreateCommandBuffer(RenderCore::Get().GetDevice());
|
m_cmd_buffers[i] = kvfCreateCommandBuffer(RenderCore::Get().GetDevice());
|
||||||
DebugLog("Vulkan: command buffer created");
|
DebugLog("Vulkan: command buffer created");
|
||||||
m_cmd_fences[i] = kvfCreateFence(RenderCore::Get().GetDevice());
|
m_cmd_fences[i] = kvfCreateFence(RenderCore::Get().GetDevice());
|
||||||
@@ -66,14 +79,15 @@ namespace mlx
|
|||||||
void Renderer::EndFrame()
|
void Renderer::EndFrame()
|
||||||
{
|
{
|
||||||
MLX_PROFILE_FUNCTION();
|
MLX_PROFILE_FUNCTION();
|
||||||
|
std::size_t render_finished_index = (p_window ? m_swapchain.GetImageIndex() : 0);
|
||||||
VkPipelineStageFlags wait_stages[] = { VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT };
|
VkPipelineStageFlags wait_stages[] = { VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT };
|
||||||
kvfEndCommandBuffer(m_cmd_buffers[m_current_frame_index]);
|
kvfEndCommandBuffer(m_cmd_buffers[m_current_frame_index]);
|
||||||
if(p_window)
|
if(p_window)
|
||||||
kvfSubmitCommandBuffer(RenderCore::Get().GetDevice(), m_cmd_buffers[m_current_frame_index], KVF_GRAPHICS_QUEUE, m_render_finished_semaphores[m_current_frame_index], m_image_available_semaphores[m_current_frame_index], m_cmd_fences[m_current_frame_index], wait_stages);
|
kvfSubmitCommandBuffer(RenderCore::Get().GetDevice(), m_cmd_buffers[m_current_frame_index], KVF_GRAPHICS_QUEUE, m_render_finished_semaphores[render_finished_index], m_image_available_semaphores[m_current_frame_index], m_cmd_fences[m_current_frame_index], wait_stages);
|
||||||
else
|
else
|
||||||
kvfSubmitCommandBuffer(RenderCore::Get().GetDevice(), m_cmd_buffers[m_current_frame_index], KVF_GRAPHICS_QUEUE, VK_NULL_HANDLE, VK_NULL_HANDLE, m_cmd_fences[m_current_frame_index], wait_stages);
|
kvfSubmitCommandBuffer(RenderCore::Get().GetDevice(), m_cmd_buffers[m_current_frame_index], KVF_GRAPHICS_QUEUE, VK_NULL_HANDLE, VK_NULL_HANDLE, m_cmd_fences[m_current_frame_index], wait_stages);
|
||||||
if(p_window)
|
if(p_window)
|
||||||
m_swapchain.Present(m_render_finished_semaphores[m_current_frame_index]);
|
m_swapchain.Present(m_render_finished_semaphores[render_finished_index]);
|
||||||
m_current_frame_index = (m_current_frame_index + 1) % MAX_FRAMES_IN_FLIGHT;
|
m_current_frame_index = (m_current_frame_index + 1) % MAX_FRAMES_IN_FLIGHT;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -81,12 +95,16 @@ namespace mlx
|
|||||||
{
|
{
|
||||||
MLX_PROFILE_FUNCTION();
|
MLX_PROFILE_FUNCTION();
|
||||||
RenderCore::Get().WaitDeviceIdle();
|
RenderCore::Get().WaitDeviceIdle();
|
||||||
|
for(std::size_t i = 0; i < m_render_finished_semaphores.size(); i++)
|
||||||
|
{
|
||||||
|
kvfDestroySemaphore(RenderCore::Get().GetDevice(), m_render_finished_semaphores[i]);
|
||||||
|
DebugLog("Vulkan: render finished semaphore destroyed");
|
||||||
|
}
|
||||||
|
m_render_finished_semaphores.clear();
|
||||||
for(std::size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++)
|
for(std::size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++)
|
||||||
{
|
{
|
||||||
kvfDestroySemaphore(RenderCore::Get().GetDevice(), m_image_available_semaphores[i]);
|
kvfDestroySemaphore(RenderCore::Get().GetDevice(), m_image_available_semaphores[i]);
|
||||||
DebugLog("Vulkan: image available semaphore destroyed");
|
DebugLog("Vulkan: image available semaphore destroyed");
|
||||||
kvfDestroySemaphore(RenderCore::Get().GetDevice(), m_render_finished_semaphores[i]);
|
|
||||||
DebugLog("Vulkan: render finished semaphore destroyed");
|
|
||||||
kvfDestroyCommandBuffer(RenderCore::Get().GetDevice(), m_cmd_buffers[i]);
|
kvfDestroyCommandBuffer(RenderCore::Get().GetDevice(), m_cmd_buffers[i]);
|
||||||
DebugLog("Vulkan: command buffer destroyed");
|
DebugLog("Vulkan: command buffer destroyed");
|
||||||
kvfDestroyFence(RenderCore::Get().GetDevice(), m_cmd_fences[i]);
|
kvfDestroyFence(RenderCore::Get().GetDevice(), m_cmd_fences[i]);
|
||||||
|
|||||||
@@ -21,6 +21,6 @@ rm vulkan-headers.zip
|
|||||||
|
|
||||||
# Update KVF
|
# Update KVF
|
||||||
rm -f ../third_party/kvf.h
|
rm -f ../third_party/kvf.h
|
||||||
git clone https://github.com/Kbz-8/KVF.git ../third_party/KVF/
|
git clone https://git.kbz8.me/kbz_8/KVF.git ../third_party/KVF/
|
||||||
mv ../third_party/KVF/kvf.h ../third_party/kvf.h
|
mv ../third_party/KVF/kvf.h ../third_party/kvf.h
|
||||||
rm -rf ../third_party/KVF
|
rm -rf ../third_party/KVF
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
[wrap-file]
|
||||||
|
directory = SDL2-2.32.8
|
||||||
|
source_url = https://github.com/libsdl-org/SDL/releases/download/release-2.32.8/SDL2-2.32.8.tar.gz
|
||||||
|
source_filename = SDL2-2.32.8.tar.gz
|
||||||
|
source_hash = 0ca83e9c9b31e18288c7ec811108e58bac1f1bb5ec6577ad386830eac51c787e
|
||||||
|
patch_filename = sdl2_2.32.8-1_patch.zip
|
||||||
|
patch_url = https://wrapdb.mesonbuild.com/v2/sdl2_2.32.8-1/get_patch
|
||||||
|
patch_hash = 5df17ea39ca418826db20e96bd821fa52b5718dac64b6225119fb6588c2744f0
|
||||||
|
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sdl2_2.32.8-1/SDL2-2.32.8.tar.gz
|
||||||
|
wrapdb_version = 2.32.8-1
|
||||||
|
|
||||||
|
[provide]
|
||||||
|
sdl2 = sdl2_dep
|
||||||
|
sdl2main = sdl2main_dep
|
||||||
|
sdl2_test = sdl2_test_dep
|
||||||
Vendored
+249
-6
@@ -1,7 +1,7 @@
|
|||||||
/***
|
/***
|
||||||
* MIT License
|
* MIT License
|
||||||
*
|
*
|
||||||
* Copyright (c) 2023-2024 kbz_8
|
* Copyright (c) 2023-2025 kbz_8
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
@@ -55,6 +55,46 @@
|
|||||||
#define VK_NO_PROTOTYPES
|
#define VK_NO_PROTOTYPES
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef KVF_NO_KHR
|
||||||
|
#ifdef VK_USE_PLATFORM_ANDROID_KHR
|
||||||
|
#include <vulkan/vulkan_android.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_WAYLAND_KHR
|
||||||
|
#include <vulkan/vulkan_wayland.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_WIN32_KHR
|
||||||
|
typedef struct HINSTANCE__* HINSTANCE;
|
||||||
|
typedef struct HWND__* HWND;
|
||||||
|
typedef struct HMONITOR__* HMONITOR;
|
||||||
|
typedef void* HANDLE;
|
||||||
|
typedef /*_Null_terminated_*/ const wchar_t* LPCWSTR;
|
||||||
|
typedef unsigned long DWORD;
|
||||||
|
typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES;
|
||||||
|
#include <vulkan/vulkan_win32.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_XCB_KHR
|
||||||
|
struct xcb_connection_t;
|
||||||
|
typedef uint32_t xcb_window_t;
|
||||||
|
typedef uint32_t xcb_visualid_t;
|
||||||
|
#include <vulkan/vulkan_xcb.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_METAL_EXT
|
||||||
|
#include <vulkan/vulkan_metal.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_XLIB_KHR
|
||||||
|
typedef struct _XDisplay Display;
|
||||||
|
typedef unsigned long XID;
|
||||||
|
typedef XID Window;
|
||||||
|
typedef unsigned long VisualID;
|
||||||
|
#include <vulkan/vulkan_xlib.h>
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <vulkan/vulkan_core.h>
|
#include <vulkan/vulkan_core.h>
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
@@ -82,6 +122,18 @@ typedef enum
|
|||||||
KVF_IMAGE_OTHER = 4,
|
KVF_IMAGE_OTHER = 4,
|
||||||
} KvfImageType;
|
} KvfImageType;
|
||||||
|
|
||||||
|
#ifndef KVF_NO_KHR
|
||||||
|
typedef enum
|
||||||
|
{
|
||||||
|
KVF_SURFACE_ANDROID = 0,
|
||||||
|
KVF_SURFACE_XLIB = 1,
|
||||||
|
KVF_SURFACE_XCB = 2,
|
||||||
|
KVF_SURFACE_WAYLAND = 3,
|
||||||
|
KVF_SURFACE_WINDOWS = 4,
|
||||||
|
KVF_SURFACE_METAL = 5,
|
||||||
|
} KvfSurfaceType;
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef void (*KvfErrorCallback)(const char* message);
|
typedef void (*KvfErrorCallback)(const char* message);
|
||||||
|
|
||||||
#ifdef KVF_IMPL_VK_NO_PROTOTYPES
|
#ifdef KVF_IMPL_VK_NO_PROTOTYPES
|
||||||
@@ -104,6 +156,7 @@ void kvfSetValidationWarningCallback(KvfErrorCallback callback);
|
|||||||
void kvfAddLayer(const char* layer);
|
void kvfAddLayer(const char* layer);
|
||||||
|
|
||||||
VkInstance kvfCreateInstance(const char** extensions_enabled, uint32_t extensions_count);
|
VkInstance kvfCreateInstance(const char** extensions_enabled, uint32_t extensions_count);
|
||||||
|
VkInstance kvfCreateInstanceNext(const char** extensions_enabled, uint32_t extensions_count, void* p_next);
|
||||||
void kvfDestroyInstance(VkInstance instance);
|
void kvfDestroyInstance(VkInstance instance);
|
||||||
|
|
||||||
// If surfaces given to theses functions are VK_NULL_HANDLE no present queues will be searched and thus kvfQueuePresentKHR will not work
|
// If surfaces given to theses functions are VK_NULL_HANDLE no present queues will be searched and thus kvfQueuePresentKHR will not work
|
||||||
@@ -147,10 +200,39 @@ void kvfDestroySemaphore(VkDevice device, VkSemaphore semaphore);
|
|||||||
uint32_t kvfGetSwapchainMinImagesCount(VkSwapchainKHR swapchain);
|
uint32_t kvfGetSwapchainMinImagesCount(VkSwapchainKHR swapchain);
|
||||||
VkExtent2D kvfGetSwapchainImagesSize(VkSwapchainKHR swapchain);
|
VkExtent2D kvfGetSwapchainImagesSize(VkSwapchainKHR swapchain);
|
||||||
void kvfDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain);
|
void kvfDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* For Windows:
|
||||||
|
* - instance_handle -> HINSTANCE
|
||||||
|
* - window_handle -> HWND window handle
|
||||||
|
*
|
||||||
|
* For Wayland:
|
||||||
|
* - instance_handle -> wl_display
|
||||||
|
* - window_handle -> wl_surface
|
||||||
|
*
|
||||||
|
* For XLIB:
|
||||||
|
* - instance_handle -> Display
|
||||||
|
* - window_handle -> Window
|
||||||
|
*
|
||||||
|
* For XCB:
|
||||||
|
* - instance_handle -> xcb_connection_t
|
||||||
|
* - window_handle -> xcb_window_t
|
||||||
|
*
|
||||||
|
* For Metal:
|
||||||
|
* - instance_handle -> ignored
|
||||||
|
* - window_handle -> CAMetalLayer
|
||||||
|
*
|
||||||
|
* For Android:
|
||||||
|
* - instance_handle -> ignored
|
||||||
|
* - window_handle -> ANativeWindow
|
||||||
|
*/
|
||||||
|
VkSurfaceKHR kvfCreateSurfaceKHR(VkInstance instance, KvfSurfaceType type, void* instance_handle, void* window_handle);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
VkImage kvfCreateImage(VkDevice device, uint32_t width, uint32_t height, VkFormat format, VkImageTiling tiling, VkImageUsageFlags usage, KvfImageType type);
|
VkImage kvfCreateImage(VkDevice device, uint32_t width, uint32_t height, VkFormat format, VkImageTiling tiling, VkImageUsageFlags usage, KvfImageType type);
|
||||||
void kvfCopyImageToBuffer(VkCommandBuffer cmd, VkBuffer dst, VkImage src, size_t buffer_offset, VkImageAspectFlagBits aspect, VkExtent3D extent);
|
void kvfCopyImageToBuffer(VkCommandBuffer cmd, VkBuffer dst, VkImage src, size_t buffer_offset, VkImageAspectFlagBits aspect, VkExtent3D extent);
|
||||||
|
void kvfCopyImageToImage(VkCommandBuffer cmd, VkImage src, VkImageLayout src_layout, VkImage dst, VkImageLayout dst_layout, uint32_t count, const VkImageCopy* regions);
|
||||||
|
|
||||||
void kvfDestroyImage(VkDevice device, VkImage image);
|
void kvfDestroyImage(VkDevice device, VkImage image);
|
||||||
VkImageView kvfCreateImageView(VkDevice device, VkImage image, VkFormat format, VkImageViewType type, VkImageAspectFlags aspect, int layer_count);
|
VkImageView kvfCreateImageView(VkDevice device, VkImage image, VkFormat format, VkImageViewType type, VkImageAspectFlags aspect, int layer_count);
|
||||||
void kvfDestroyImageView(VkDevice device, VkImageView image_view);
|
void kvfDestroyImageView(VkDevice device, VkImageView image_view);
|
||||||
@@ -235,6 +317,7 @@ VkPipeline kvfCreateGraphicsPipeline(VkDevice device, VkPipelineCache cache, VkP
|
|||||||
void kvfDestroyPipeline(VkDevice device, VkPipeline pipeline);
|
void kvfDestroyPipeline(VkDevice device, VkPipeline pipeline);
|
||||||
|
|
||||||
void kvfCheckVk(VkResult result);
|
void kvfCheckVk(VkResult result);
|
||||||
|
int32_t kvfFindMemoryType(VkPhysicalDevice physical_device, uint32_t type_filter, VkMemoryPropertyFlags properties);
|
||||||
|
|
||||||
#ifdef KVF_IMPL_VK_NO_PROTOTYPES
|
#ifdef KVF_IMPL_VK_NO_PROTOTYPES
|
||||||
#ifdef KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE
|
#ifdef KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE
|
||||||
@@ -268,6 +351,42 @@ void kvfCheckVk(VkResult result);
|
|||||||
KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE(vkGetPhysicalDeviceSurfaceFormatsKHR);
|
KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE(vkGetPhysicalDeviceSurfaceFormatsKHR);
|
||||||
KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE(vkGetPhysicalDeviceSurfacePresentModesKHR);
|
KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE(vkGetPhysicalDeviceSurfacePresentModesKHR);
|
||||||
KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE(vkGetPhysicalDeviceSurfaceSupportKHR);
|
KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE(vkGetPhysicalDeviceSurfaceSupportKHR);
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_ANDROID_KHR
|
||||||
|
#ifdef VK_KHR_android_surface
|
||||||
|
KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE(vkCreateAndroidSurfaceKHR);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_XCB_KHR
|
||||||
|
#ifdef VK_KHR_xcb_surface
|
||||||
|
KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE(vkCreateXcbSurfaceKHR);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_XLIB_KHR
|
||||||
|
#ifdef VK_KHR_xlib_surface
|
||||||
|
KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE(vkCreateXlibSurfaceKHR);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_WAYLAND_KHR
|
||||||
|
#ifdef VK_KHR_wayland_surface
|
||||||
|
KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE(vkCreateWaylandSurfaceKHR);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_WIN32_KHR
|
||||||
|
#ifdef VK_KHR_win32_surface
|
||||||
|
KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE(vkCreateWin32SurfaceKHR);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_METAL_EXT
|
||||||
|
#ifdef VK_EXT_metal_surface
|
||||||
|
KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE(vkCreateMetalSurfaceEXT);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -519,6 +638,19 @@ void kvfCheckVk(VkResult result)
|
|||||||
__kvfCheckVk(result);
|
__kvfCheckVk(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int32_t kvfFindMemoryType(VkPhysicalDevice physical_device, uint32_t type_filter, VkMemoryPropertyFlags properties)
|
||||||
|
{
|
||||||
|
VkPhysicalDeviceMemoryProperties mem_properties;
|
||||||
|
KVF_GET_INSTANCE_FUNCTION(vkGetPhysicalDeviceMemoryProperties)(physical_device, &mem_properties);
|
||||||
|
|
||||||
|
for(int32_t i = 0; i < (int32_t)mem_properties.memoryTypeCount; i++)
|
||||||
|
{
|
||||||
|
if((type_filter & (1 << i)) && (mem_properties.memoryTypes[i].propertyFlags & properties) == properties)
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
void __kvfAddDeviceToArray(VkPhysicalDevice device, int32_t graphics_queue, int32_t present_queue, int32_t compute_queue)
|
void __kvfAddDeviceToArray(VkPhysicalDevice device, int32_t graphics_queue, int32_t present_queue, int32_t compute_queue)
|
||||||
{
|
{
|
||||||
KVF_ASSERT(device != VK_NULL_HANDLE);
|
KVF_ASSERT(device != VK_NULL_HANDLE);
|
||||||
@@ -1151,7 +1283,7 @@ const char* kvfVerbaliseVkResult(VkResult result)
|
|||||||
case VK_ERROR_OUT_OF_DATE_KHR: return "A surface has changed in such a way that it is no longer compatible with the swapchain";
|
case VK_ERROR_OUT_OF_DATE_KHR: return "A surface has changed in such a way that it is no longer compatible with the swapchain";
|
||||||
case VK_ERROR_INCOMPATIBLE_DISPLAY_KHR: return "The display used by a swapchain does not use the same presentable image layout";
|
case VK_ERROR_INCOMPATIBLE_DISPLAY_KHR: return "The display used by a swapchain does not use the same presentable image layout";
|
||||||
case VK_ERROR_NATIVE_WINDOW_IN_USE_KHR: return "The requested window is already connected to a VkSurfaceKHR, or to some other non-Vulkan API";
|
case VK_ERROR_NATIVE_WINDOW_IN_USE_KHR: return "The requested window is already connected to a VkSurfaceKHR, or to some other non-Vulkan API";
|
||||||
case VK_ERROR_VALIDATION_FAILED_EXT: return "A validation layer found an error";
|
case VK_ERROR_VALIDATION_FAILED_EXT: return "A command failed because invalid usage was detected by the implementation or a validation layer.";
|
||||||
|
|
||||||
default: return "Unknown Vulkan error";
|
default: return "Unknown Vulkan error";
|
||||||
}
|
}
|
||||||
@@ -1295,6 +1427,11 @@ void kvfAddLayer(const char* layer)
|
|||||||
}
|
}
|
||||||
|
|
||||||
VkInstance kvfCreateInstance(const char** extensions_enabled, uint32_t extensions_count)
|
VkInstance kvfCreateInstance(const char** extensions_enabled, uint32_t extensions_count)
|
||||||
|
{
|
||||||
|
return kvfCreateInstanceNext(extensions_enabled, extensions_count, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
VkInstance kvfCreateInstanceNext(const char** extensions_enabled, uint32_t extensions_count, void* p_next)
|
||||||
{
|
{
|
||||||
VkInstance instance = VK_NULL_HANDLE;
|
VkInstance instance = VK_NULL_HANDLE;
|
||||||
|
|
||||||
@@ -1305,7 +1442,7 @@ VkInstance kvfCreateInstance(const char** extensions_enabled, uint32_t extension
|
|||||||
create_info.ppEnabledExtensionNames = extensions_enabled;
|
create_info.ppEnabledExtensionNames = extensions_enabled;
|
||||||
create_info.enabledLayerCount = 0;
|
create_info.enabledLayerCount = 0;
|
||||||
create_info.ppEnabledLayerNames = NULL;
|
create_info.ppEnabledLayerNames = NULL;
|
||||||
create_info.pNext = NULL;
|
create_info.pNext = p_next;
|
||||||
#if defined(VK_USE_PLATFORM_MACOS_MVK) || defined(VK_USE_PLATFORM_METAL_EXT)
|
#if defined(VK_USE_PLATFORM_MACOS_MVK) || defined(VK_USE_PLATFORM_METAL_EXT)
|
||||||
create_info.flags = VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
|
create_info.flags = VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
|
||||||
#else
|
#else
|
||||||
@@ -1324,6 +1461,8 @@ VkInstance kvfCreateInstance(const char** extensions_enabled, uint32_t extension
|
|||||||
memcpy(new_extension_set, extensions_enabled, sizeof(char*) * extensions_count);
|
memcpy(new_extension_set, extensions_enabled, sizeof(char*) * extensions_count);
|
||||||
new_extension_set[extensions_count] = VK_EXT_DEBUG_UTILS_EXTENSION_NAME;
|
new_extension_set[extensions_count] = VK_EXT_DEBUG_UTILS_EXTENSION_NAME;
|
||||||
|
|
||||||
|
debug_create_info.pNext = p_next;
|
||||||
|
|
||||||
create_info.enabledExtensionCount = extensions_count + 1;
|
create_info.enabledExtensionCount = extensions_count + 1;
|
||||||
create_info.ppEnabledExtensionNames = new_extension_set;
|
create_info.ppEnabledExtensionNames = new_extension_set;
|
||||||
create_info.enabledLayerCount = __kvf_extra_layers_count;
|
create_info.enabledLayerCount = __kvf_extra_layers_count;
|
||||||
@@ -2069,6 +2208,98 @@ void kvfDestroySemaphore(VkDevice device, VkSemaphore semaphore)
|
|||||||
KVF_ASSERT(device != VK_NULL_HANDLE);
|
KVF_ASSERT(device != VK_NULL_HANDLE);
|
||||||
__kvfDestroySwapchain(device, swapchain);
|
__kvfDestroySwapchain(device, swapchain);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
VkSurfaceKHR kvfCreateSurfaceKHR(VkInstance instance, KvfSurfaceType type, void* instance_handle, void* window_handle)
|
||||||
|
{
|
||||||
|
VkSurfaceKHR surface = VK_NULL_HANDLE;
|
||||||
|
switch(type)
|
||||||
|
{
|
||||||
|
#ifdef VK_USE_PLATFORM_ANDROID_KHR
|
||||||
|
case KVF_SURFACE_ANDROID:
|
||||||
|
{
|
||||||
|
VkAndroidSurfaceCreateInfoKHR create_info = {};
|
||||||
|
create_info.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR;
|
||||||
|
create_info.pNext = nullptr;
|
||||||
|
create_info.flags = 0;
|
||||||
|
create_info.window = (ANativeWindow*)window_handle;
|
||||||
|
kvfCheckVk(KVF_GET_INSTANCE_FUNCTION(vkCreateAndroidSurfaceKHR)(instance, &create_info, NULL, &surface));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_XLIB_KHR
|
||||||
|
case KVF_SURFACE_XLIB:
|
||||||
|
{
|
||||||
|
VkXlibSurfaceCreateInfoKHR create_info = {};
|
||||||
|
create_info.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR;
|
||||||
|
create_info.pNext = nullptr;
|
||||||
|
create_info.flags = 0;
|
||||||
|
create_info.dpy = (Display*)instance_handle;
|
||||||
|
create_info.window = *(Window*)window_handle;
|
||||||
|
kvfCheckVk(KVF_GET_INSTANCE_FUNCTION(vkCreateXlibSurfaceKHR)(instance, &create_info, NULL, &surface));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_XCB_KHR
|
||||||
|
case KVF_SURFACE_XCB:
|
||||||
|
{
|
||||||
|
VkXcbSurfaceCreateInfoKHR create_info = {};
|
||||||
|
create_info.sType = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR;
|
||||||
|
create_info.pNext = nullptr;
|
||||||
|
create_info.flags = 0;
|
||||||
|
create_info.connection = (xcb_connection_t*)instance_handle;
|
||||||
|
create_info.window = (*xcb_window_t*)window_handle;
|
||||||
|
kvfCheckVk(KVF_GET_INSTANCE_FUNCTION(vkCreateXcbSurfaceKHR)(instance, &create_info, NULL, &surface));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_WAYLAND_KHR
|
||||||
|
case KVF_SURFACE_WAYLAND:
|
||||||
|
{
|
||||||
|
VkWaylandSurfaceCreateInfoKHR create_info = {};
|
||||||
|
create_info.sType = VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR;
|
||||||
|
create_info.pNext = nullptr;
|
||||||
|
create_info.flags = 0;
|
||||||
|
create_info.display = (wl_display*)instance_handle;
|
||||||
|
create_info.surface = (wl_surface*)window_handle;
|
||||||
|
kvfCheckVk(KVF_GET_INSTANCE_FUNCTION(vkCreateWaylandSurfaceKHR)(instance, &create_info, NULL, &surface));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_WIN32_KHR
|
||||||
|
case KVF_SURFACE_WINDOWS:
|
||||||
|
{
|
||||||
|
VkWin32SurfaceCreateInfoKHR create_info = {};
|
||||||
|
create_info.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR;
|
||||||
|
create_info.pNext = nullptr;
|
||||||
|
create_info.flags = 0;
|
||||||
|
create_info.hinstance = (HINSTANCE)instance_handle;
|
||||||
|
create_info.hwnd = (HWND)window_handle;
|
||||||
|
kvfCheckVk(KVF_GET_INSTANCE_FUNCTION(vkCreateWin32SurfaceKHR)(instance, &create_info, NULL, &surface));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef VK_USE_PLATFORM_METAL_EXT
|
||||||
|
case KVF_SURFACE_METAL:
|
||||||
|
{
|
||||||
|
VkMetalSurfaceCreateInfoEXT create_info = {};
|
||||||
|
create_info.sType = VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT;
|
||||||
|
create_info.pNext = nullptr;
|
||||||
|
create_info.flags = 0;
|
||||||
|
create_info.pLayer = (CAMetalLayer*)window_handle;
|
||||||
|
kvfCheckVk(KVF_GET_INSTANCE_FUNCTION(vkCreateMetalSurfaceEXT)(instance, &create_info, NULL, &surface));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
default: break;
|
||||||
|
}
|
||||||
|
return surface;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
VkImage kvfCreateImage(VkDevice device, uint32_t width, uint32_t height, VkFormat format, VkImageTiling tiling, VkImageUsageFlags usage, KvfImageType type)
|
VkImage kvfCreateImage(VkDevice device, uint32_t width, uint32_t height, VkFormat format, VkImageTiling tiling, VkImageUsageFlags usage, KvfImageType type)
|
||||||
@@ -2125,6 +2356,18 @@ void kvfCopyImageToBuffer(VkCommandBuffer cmd, VkBuffer dst, VkImage src, size_t
|
|||||||
KVF_GET_DEVICE_FUNCTION(vkCmdCopyImageToBuffer)(cmd, src, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst, 1, ®ion);
|
KVF_GET_DEVICE_FUNCTION(vkCmdCopyImageToBuffer)(cmd, src, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst, 1, ®ion);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void kvfCopyImageToImage(VkCommandBuffer cmd, VkImage src, VkImageLayout src_layout, VkImage dst, VkImageLayout dst_layout, uint32_t count, const VkImageCopy* regions)
|
||||||
|
{
|
||||||
|
KVF_ASSERT(cmd != VK_NULL_HANDLE);
|
||||||
|
KVF_ASSERT(dst != VK_NULL_HANDLE);
|
||||||
|
KVF_ASSERT(src != VK_NULL_HANDLE);
|
||||||
|
#ifdef KVF_IMPL_VK_NO_PROTOTYPES
|
||||||
|
__KvfDevice* kvf_device = __kvfGetKvfDeviceFromVkCommandBuffer(cmd);
|
||||||
|
KVF_ASSERT(kvf_device != NULL && "could not find VkDevice in registered devices");
|
||||||
|
#endif
|
||||||
|
KVF_GET_DEVICE_FUNCTION(vkCmdCopyImage)(cmd, src, src_layout, dst, dst_layout, count, regions);
|
||||||
|
}
|
||||||
|
|
||||||
void kvfDestroyImage(VkDevice device, VkImage image)
|
void kvfDestroyImage(VkDevice device, VkImage image)
|
||||||
{
|
{
|
||||||
if(image == VK_NULL_HANDLE)
|
if(image == VK_NULL_HANDLE)
|
||||||
@@ -2316,7 +2559,7 @@ void kvfCopyBufferToImage(VkCommandBuffer cmd, VkImage dst, VkBuffer src, size_t
|
|||||||
|
|
||||||
void kvfDestroyBuffer(VkDevice device, VkBuffer buffer)
|
void kvfDestroyBuffer(VkDevice device, VkBuffer buffer)
|
||||||
{
|
{
|
||||||
if(buffer != VK_NULL_HANDLE)
|
if(buffer == VK_NULL_HANDLE)
|
||||||
return;
|
return;
|
||||||
KVF_ASSERT(device != VK_NULL_HANDLE);
|
KVF_ASSERT(device != VK_NULL_HANDLE);
|
||||||
__KvfDevice* kvf_device = __kvfGetKvfDeviceFromVkDevice(device);
|
__KvfDevice* kvf_device = __kvfGetKvfDeviceFromVkDevice(device);
|
||||||
@@ -2933,7 +3176,7 @@ void kvfGPipelineBuilderEnableAdditiveBlending(KvfGraphicsPipelineBuilder* build
|
|||||||
builder->color_blend_attachment_state.dstColorBlendFactor = VK_BLEND_FACTOR_ONE;
|
builder->color_blend_attachment_state.dstColorBlendFactor = VK_BLEND_FACTOR_ONE;
|
||||||
builder->color_blend_attachment_state.colorBlendOp = VK_BLEND_OP_ADD;
|
builder->color_blend_attachment_state.colorBlendOp = VK_BLEND_OP_ADD;
|
||||||
builder->color_blend_attachment_state.srcAlphaBlendFactor = VK_BLEND_FACTOR_ONE;
|
builder->color_blend_attachment_state.srcAlphaBlendFactor = VK_BLEND_FACTOR_ONE;
|
||||||
builder->color_blend_attachment_state.dstAlphaBlendFactor = VK_BLEND_FACTOR_ZERO;
|
builder->color_blend_attachment_state.dstAlphaBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA;
|
||||||
builder->color_blend_attachment_state.alphaBlendOp = VK_BLEND_OP_ADD;
|
builder->color_blend_attachment_state.alphaBlendOp = VK_BLEND_OP_ADD;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2946,7 +3189,7 @@ void kvfGPipelineBuilderEnableAlphaBlending(KvfGraphicsPipelineBuilder* builder)
|
|||||||
builder->color_blend_attachment_state.dstColorBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA;
|
builder->color_blend_attachment_state.dstColorBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA;
|
||||||
builder->color_blend_attachment_state.colorBlendOp = VK_BLEND_OP_ADD;
|
builder->color_blend_attachment_state.colorBlendOp = VK_BLEND_OP_ADD;
|
||||||
builder->color_blend_attachment_state.srcAlphaBlendFactor = VK_BLEND_FACTOR_ONE;
|
builder->color_blend_attachment_state.srcAlphaBlendFactor = VK_BLEND_FACTOR_ONE;
|
||||||
builder->color_blend_attachment_state.dstAlphaBlendFactor = VK_BLEND_FACTOR_ZERO;
|
builder->color_blend_attachment_state.dstAlphaBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA;
|
||||||
builder->color_blend_attachment_state.alphaBlendOp = VK_BLEND_OP_ADD;
|
builder->color_blend_attachment_state.alphaBlendOp = VK_BLEND_OP_ADD;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+23
-23
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_VIDEO_CODEC_AV1STD_H_ 1
|
#define VULKAN_VIDEO_CODEC_AV1STD_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@@ -22,27 +22,27 @@ extern "C" {
|
|||||||
// vulkan_video_codec_av1std is a preprocessor guard. Do not pass it to API calls.
|
// vulkan_video_codec_av1std is a preprocessor guard. Do not pass it to API calls.
|
||||||
#define vulkan_video_codec_av1std 1
|
#define vulkan_video_codec_av1std 1
|
||||||
#include "vulkan_video_codecs_common.h"
|
#include "vulkan_video_codecs_common.h"
|
||||||
#define STD_VIDEO_AV1_NUM_REF_FRAMES 8
|
#define STD_VIDEO_AV1_NUM_REF_FRAMES 8U
|
||||||
#define STD_VIDEO_AV1_REFS_PER_FRAME 7
|
#define STD_VIDEO_AV1_REFS_PER_FRAME 7U
|
||||||
#define STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME 8
|
#define STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME 8U
|
||||||
#define STD_VIDEO_AV1_MAX_TILE_COLS 64
|
#define STD_VIDEO_AV1_MAX_TILE_COLS 64U
|
||||||
#define STD_VIDEO_AV1_MAX_TILE_ROWS 64
|
#define STD_VIDEO_AV1_MAX_TILE_ROWS 64U
|
||||||
#define STD_VIDEO_AV1_MAX_SEGMENTS 8
|
#define STD_VIDEO_AV1_MAX_SEGMENTS 8U
|
||||||
#define STD_VIDEO_AV1_SEG_LVL_MAX 8
|
#define STD_VIDEO_AV1_SEG_LVL_MAX 8U
|
||||||
#define STD_VIDEO_AV1_PRIMARY_REF_NONE 7
|
#define STD_VIDEO_AV1_PRIMARY_REF_NONE 7U
|
||||||
#define STD_VIDEO_AV1_SELECT_INTEGER_MV 2
|
#define STD_VIDEO_AV1_SELECT_INTEGER_MV 2U
|
||||||
#define STD_VIDEO_AV1_SELECT_SCREEN_CONTENT_TOOLS 2
|
#define STD_VIDEO_AV1_SELECT_SCREEN_CONTENT_TOOLS 2U
|
||||||
#define STD_VIDEO_AV1_SKIP_MODE_FRAMES 2
|
#define STD_VIDEO_AV1_SKIP_MODE_FRAMES 2U
|
||||||
#define STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS 4
|
#define STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS 4U
|
||||||
#define STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS 2
|
#define STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS 2U
|
||||||
#define STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS 8
|
#define STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS 8U
|
||||||
#define STD_VIDEO_AV1_MAX_NUM_PLANES 3
|
#define STD_VIDEO_AV1_MAX_NUM_PLANES 3U
|
||||||
#define STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS 6
|
#define STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS 6U
|
||||||
#define STD_VIDEO_AV1_MAX_NUM_Y_POINTS 14
|
#define STD_VIDEO_AV1_MAX_NUM_Y_POINTS 14U
|
||||||
#define STD_VIDEO_AV1_MAX_NUM_CB_POINTS 10
|
#define STD_VIDEO_AV1_MAX_NUM_CB_POINTS 10U
|
||||||
#define STD_VIDEO_AV1_MAX_NUM_CR_POINTS 10
|
#define STD_VIDEO_AV1_MAX_NUM_CR_POINTS 10U
|
||||||
#define STD_VIDEO_AV1_MAX_NUM_POS_LUMA 24
|
#define STD_VIDEO_AV1_MAX_NUM_POS_LUMA 24U
|
||||||
#define STD_VIDEO_AV1_MAX_NUM_POS_CHROMA 25
|
#define STD_VIDEO_AV1_MAX_NUM_POS_CHROMA 25U
|
||||||
|
|
||||||
typedef enum StdVideoAV1Profile {
|
typedef enum StdVideoAV1Profile {
|
||||||
STD_VIDEO_AV1_PROFILE_MAIN = 0,
|
STD_VIDEO_AV1_PROFILE_MAIN = 0,
|
||||||
@@ -144,7 +144,7 @@ typedef enum StdVideoAV1ColorPrimaries {
|
|||||||
STD_VIDEO_AV1_COLOR_PRIMARIES_SMPTE_432 = 12,
|
STD_VIDEO_AV1_COLOR_PRIMARIES_SMPTE_432 = 12,
|
||||||
STD_VIDEO_AV1_COLOR_PRIMARIES_EBU_3213 = 22,
|
STD_VIDEO_AV1_COLOR_PRIMARIES_EBU_3213 = 22,
|
||||||
STD_VIDEO_AV1_COLOR_PRIMARIES_INVALID = 0x7FFFFFFF,
|
STD_VIDEO_AV1_COLOR_PRIMARIES_INVALID = 0x7FFFFFFF,
|
||||||
// STD_VIDEO_AV1_COLOR_PRIMARIES_BT_UNSPECIFIED is a deprecated alias
|
// STD_VIDEO_AV1_COLOR_PRIMARIES_BT_UNSPECIFIED is a legacy alias
|
||||||
STD_VIDEO_AV1_COLOR_PRIMARIES_BT_UNSPECIFIED = STD_VIDEO_AV1_COLOR_PRIMARIES_UNSPECIFIED,
|
STD_VIDEO_AV1_COLOR_PRIMARIES_BT_UNSPECIFIED = STD_VIDEO_AV1_COLOR_PRIMARIES_UNSPECIFIED,
|
||||||
STD_VIDEO_AV1_COLOR_PRIMARIES_MAX_ENUM = 0x7FFFFFFF
|
STD_VIDEO_AV1_COLOR_PRIMARIES_MAX_ENUM = 0x7FFFFFFF
|
||||||
} StdVideoAV1ColorPrimaries;
|
} StdVideoAV1ColorPrimaries;
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1
|
#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_VIDEO_CODEC_AV1STD_ENCODE_H_ 1
|
#define VULKAN_VIDEO_CODEC_AV1STD_ENCODE_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
+9
-9
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_VIDEO_CODEC_H264STD_H_ 1
|
#define VULKAN_VIDEO_CODEC_H264STD_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@@ -22,14 +22,14 @@ extern "C" {
|
|||||||
// vulkan_video_codec_h264std is a preprocessor guard. Do not pass it to API calls.
|
// vulkan_video_codec_h264std is a preprocessor guard. Do not pass it to API calls.
|
||||||
#define vulkan_video_codec_h264std 1
|
#define vulkan_video_codec_h264std 1
|
||||||
#include "vulkan_video_codecs_common.h"
|
#include "vulkan_video_codecs_common.h"
|
||||||
#define STD_VIDEO_H264_CPB_CNT_LIST_SIZE 32
|
#define STD_VIDEO_H264_CPB_CNT_LIST_SIZE 32U
|
||||||
#define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS 6
|
#define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS 6U
|
||||||
#define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS 16
|
#define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS 16U
|
||||||
#define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS 6
|
#define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS 6U
|
||||||
#define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS 64
|
#define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS 64U
|
||||||
#define STD_VIDEO_H264_MAX_NUM_LIST_REF 32
|
#define STD_VIDEO_H264_MAX_NUM_LIST_REF 32U
|
||||||
#define STD_VIDEO_H264_MAX_CHROMA_PLANES 2
|
#define STD_VIDEO_H264_MAX_CHROMA_PLANES 2U
|
||||||
#define STD_VIDEO_H264_NO_REFERENCE_PICTURE 0xFF
|
#define STD_VIDEO_H264_NO_REFERENCE_PICTURE 0xFFU
|
||||||
|
|
||||||
typedef enum StdVideoH264ChromaFormatIdc {
|
typedef enum StdVideoH264ChromaFormatIdc {
|
||||||
STD_VIDEO_H264_CHROMA_FORMAT_IDC_MONOCHROME = 0,
|
STD_VIDEO_H264_CHROMA_FORMAT_IDC_MONOCHROME = 0,
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_VIDEO_CODEC_H264STD_DECODE_H_ 1
|
#define VULKAN_VIDEO_CODEC_H264STD_DECODE_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@@ -27,7 +27,7 @@ extern "C" {
|
|||||||
|
|
||||||
#define VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_API_VERSION_1_0_0
|
#define VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_API_VERSION_1_0_0
|
||||||
#define VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_h264_decode"
|
#define VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_h264_decode"
|
||||||
#define STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE 2
|
#define STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE 2U
|
||||||
|
|
||||||
typedef enum StdVideoDecodeH264FieldOrderCount {
|
typedef enum StdVideoDecodeH264FieldOrderCount {
|
||||||
STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_TOP = 0,
|
STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_TOP = 0,
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_VIDEO_CODEC_H264STD_ENCODE_H_ 1
|
#define VULKAN_VIDEO_CODEC_H264STD_ENCODE_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
+24
-24
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_VIDEO_CODEC_H265STD_H_ 1
|
#define VULKAN_VIDEO_CODEC_H265STD_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@@ -22,29 +22,29 @@ extern "C" {
|
|||||||
// vulkan_video_codec_h265std is a preprocessor guard. Do not pass it to API calls.
|
// vulkan_video_codec_h265std is a preprocessor guard. Do not pass it to API calls.
|
||||||
#define vulkan_video_codec_h265std 1
|
#define vulkan_video_codec_h265std 1
|
||||||
#include "vulkan_video_codecs_common.h"
|
#include "vulkan_video_codecs_common.h"
|
||||||
#define STD_VIDEO_H265_CPB_CNT_LIST_SIZE 32
|
#define STD_VIDEO_H265_CPB_CNT_LIST_SIZE 32U
|
||||||
#define STD_VIDEO_H265_SUBLAYERS_LIST_SIZE 7
|
#define STD_VIDEO_H265_SUBLAYERS_LIST_SIZE 7U
|
||||||
#define STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS 6
|
#define STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS 6U
|
||||||
#define STD_VIDEO_H265_SCALING_LIST_4X4_NUM_ELEMENTS 16
|
#define STD_VIDEO_H265_SCALING_LIST_4X4_NUM_ELEMENTS 16U
|
||||||
#define STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS 6
|
#define STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS 6U
|
||||||
#define STD_VIDEO_H265_SCALING_LIST_8X8_NUM_ELEMENTS 64
|
#define STD_VIDEO_H265_SCALING_LIST_8X8_NUM_ELEMENTS 64U
|
||||||
#define STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS 6
|
#define STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS 6U
|
||||||
#define STD_VIDEO_H265_SCALING_LIST_16X16_NUM_ELEMENTS 64
|
#define STD_VIDEO_H265_SCALING_LIST_16X16_NUM_ELEMENTS 64U
|
||||||
#define STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS 2
|
#define STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS 2U
|
||||||
#define STD_VIDEO_H265_SCALING_LIST_32X32_NUM_ELEMENTS 64
|
#define STD_VIDEO_H265_SCALING_LIST_32X32_NUM_ELEMENTS 64U
|
||||||
#define STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE 6
|
#define STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE 6U
|
||||||
#define STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_COLS_LIST_SIZE 19
|
#define STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_COLS_LIST_SIZE 19U
|
||||||
#define STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_ROWS_LIST_SIZE 21
|
#define STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_ROWS_LIST_SIZE 21U
|
||||||
#define STD_VIDEO_H265_PREDICTOR_PALETTE_COMPONENTS_LIST_SIZE 3
|
#define STD_VIDEO_H265_PREDICTOR_PALETTE_COMPONENTS_LIST_SIZE 3U
|
||||||
#define STD_VIDEO_H265_PREDICTOR_PALETTE_COMP_ENTRIES_LIST_SIZE 128
|
#define STD_VIDEO_H265_PREDICTOR_PALETTE_COMP_ENTRIES_LIST_SIZE 128U
|
||||||
#define STD_VIDEO_H265_MAX_NUM_LIST_REF 15
|
#define STD_VIDEO_H265_MAX_NUM_LIST_REF 15U
|
||||||
#define STD_VIDEO_H265_MAX_CHROMA_PLANES 2
|
#define STD_VIDEO_H265_MAX_CHROMA_PLANES 2U
|
||||||
#define STD_VIDEO_H265_MAX_SHORT_TERM_REF_PIC_SETS 64
|
#define STD_VIDEO_H265_MAX_SHORT_TERM_REF_PIC_SETS 64U
|
||||||
#define STD_VIDEO_H265_MAX_DPB_SIZE 16
|
#define STD_VIDEO_H265_MAX_DPB_SIZE 16U
|
||||||
#define STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS 32
|
#define STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS 32U
|
||||||
#define STD_VIDEO_H265_MAX_LONG_TERM_PICS 16
|
#define STD_VIDEO_H265_MAX_LONG_TERM_PICS 16U
|
||||||
#define STD_VIDEO_H265_MAX_DELTA_POC 48
|
#define STD_VIDEO_H265_MAX_DELTA_POC 48U
|
||||||
#define STD_VIDEO_H265_NO_REFERENCE_PICTURE 0xFF
|
#define STD_VIDEO_H265_NO_REFERENCE_PICTURE 0xFFU
|
||||||
|
|
||||||
typedef enum StdVideoH265ChromaFormatIdc {
|
typedef enum StdVideoH265ChromaFormatIdc {
|
||||||
STD_VIDEO_H265_CHROMA_FORMAT_IDC_MONOCHROME = 0,
|
STD_VIDEO_H265_CHROMA_FORMAT_IDC_MONOCHROME = 0,
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_VIDEO_CODEC_H265STD_DECODE_H_ 1
|
#define VULKAN_VIDEO_CODEC_H265STD_DECODE_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@@ -27,7 +27,7 @@ extern "C" {
|
|||||||
|
|
||||||
#define VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_API_VERSION_1_0_0
|
#define VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_API_VERSION_1_0_0
|
||||||
#define VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_h265_decode"
|
#define VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_h265_decode"
|
||||||
#define STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE 8
|
#define STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE 8U
|
||||||
typedef struct StdVideoDecodeH265PictureInfoFlags {
|
typedef struct StdVideoDecodeH265PictureInfoFlags {
|
||||||
uint32_t IrapPicFlag : 1;
|
uint32_t IrapPicFlag : 1;
|
||||||
uint32_t IdrPicFlag : 1;
|
uint32_t IdrPicFlag : 1;
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_VIDEO_CODEC_H265STD_ENCODE_H_ 1
|
#define VULKAN_VIDEO_CODEC_H265STD_ENCODE_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
+9
-9
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_VIDEO_CODEC_VP9STD_H_ 1
|
#define VULKAN_VIDEO_CODEC_VP9STD_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@@ -22,14 +22,14 @@ extern "C" {
|
|||||||
// vulkan_video_codec_vp9std is a preprocessor guard. Do not pass it to API calls.
|
// vulkan_video_codec_vp9std is a preprocessor guard. Do not pass it to API calls.
|
||||||
#define vulkan_video_codec_vp9std 1
|
#define vulkan_video_codec_vp9std 1
|
||||||
#include "vulkan_video_codecs_common.h"
|
#include "vulkan_video_codecs_common.h"
|
||||||
#define STD_VIDEO_VP9_NUM_REF_FRAMES 8
|
#define STD_VIDEO_VP9_NUM_REF_FRAMES 8U
|
||||||
#define STD_VIDEO_VP9_REFS_PER_FRAME 3
|
#define STD_VIDEO_VP9_REFS_PER_FRAME 3U
|
||||||
#define STD_VIDEO_VP9_MAX_REF_FRAMES 4
|
#define STD_VIDEO_VP9_MAX_REF_FRAMES 4U
|
||||||
#define STD_VIDEO_VP9_LOOP_FILTER_ADJUSTMENTS 2
|
#define STD_VIDEO_VP9_LOOP_FILTER_ADJUSTMENTS 2U
|
||||||
#define STD_VIDEO_VP9_MAX_SEGMENTS 8
|
#define STD_VIDEO_VP9_MAX_SEGMENTS 8U
|
||||||
#define STD_VIDEO_VP9_SEG_LVL_MAX 4
|
#define STD_VIDEO_VP9_SEG_LVL_MAX 4U
|
||||||
#define STD_VIDEO_VP9_MAX_SEGMENTATION_TREE_PROBS 7
|
#define STD_VIDEO_VP9_MAX_SEGMENTATION_TREE_PROBS 7U
|
||||||
#define STD_VIDEO_VP9_MAX_SEGMENTATION_PRED_PROB 3
|
#define STD_VIDEO_VP9_MAX_SEGMENTATION_PRED_PROB 3U
|
||||||
|
|
||||||
typedef enum StdVideoVP9Profile {
|
typedef enum StdVideoVP9Profile {
|
||||||
STD_VIDEO_VP9_PROFILE_0 = 0,
|
STD_VIDEO_VP9_PROFILE_0 = 0,
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_VIDEO_CODEC_VP9STD_DECODE_H_ 1
|
#define VULKAN_VIDEO_CODEC_VP9STD_DECODE_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_VIDEO_CODECS_COMMON_H_ 1
|
#define VULKAN_VIDEO_CODECS_COMMON_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
Vendored
+2
-1
@@ -44,8 +44,9 @@
|
|||||||
typedef VkResult(VKAPI_PTR *PFN_vkNegotiateLoaderICDInterfaceVersion)(uint32_t *pVersion);
|
typedef VkResult(VKAPI_PTR *PFN_vkNegotiateLoaderICDInterfaceVersion)(uint32_t *pVersion);
|
||||||
// This is defined in vk_layer.h which will be found by the loader, but if an ICD is building against this
|
// This is defined in vk_layer.h which will be found by the loader, but if an ICD is building against this
|
||||||
// file directly, it won't be found.
|
// file directly, it won't be found.
|
||||||
#ifndef PFN_GetPhysicalDeviceProcAddr
|
#ifndef IS_DEFINED_PFN_GetPhysicalDeviceProcAddr
|
||||||
typedef PFN_vkVoidFunction(VKAPI_PTR *PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char *pName);
|
typedef PFN_vkVoidFunction(VKAPI_PTR *PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char *pName);
|
||||||
|
#define IS_DEFINED_PFN_GetPhysicalDeviceProcAddr
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Typedefs for loader/ICD interface
|
// Typedefs for loader/ICD interface
|
||||||
|
|||||||
Vendored
+3
@@ -27,7 +27,10 @@
|
|||||||
#define VK_CURRENT_CHAIN_VERSION 1
|
#define VK_CURRENT_CHAIN_VERSION 1
|
||||||
|
|
||||||
// Typedef for use in the interfaces below
|
// Typedef for use in the interfaces below
|
||||||
|
#ifndef IS_DEFINED_PFN_GetPhysicalDeviceProcAddr
|
||||||
typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char* pName);
|
typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char* pName);
|
||||||
|
#define IS_DEFINED_PFN_GetPhysicalDeviceProcAddr
|
||||||
|
#endif
|
||||||
|
|
||||||
// Version negotiation values
|
// Version negotiation values
|
||||||
typedef enum VkNegotiateLayerStructType {
|
typedef enum VkNegotiateLayerStructType {
|
||||||
|
|||||||
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
// File: vk_platform.h
|
// File: vk_platform.h
|
||||||
//
|
//
|
||||||
/*
|
/*
|
||||||
** Copyright 2014-2025 The Khronos Group Inc.
|
** Copyright 2014-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
Vendored
+917
-8449
File diff suppressed because it is too large
Load Diff
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_H_ 1
|
#define VULKAN_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
Vendored
+18253
-5185
File diff suppressed because it is too large
Load Diff
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_ANDROID_H_ 1
|
#define VULKAN_ANDROID_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
Vendored
+32
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_BETA_H_ 1
|
#define VULKAN_BETA_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@@ -337,6 +337,37 @@ typedef struct VkAccelerationStructureTrianglesDisplacementMicromapNV {
|
|||||||
} VkAccelerationStructureTrianglesDisplacementMicromapNV;
|
} VkAccelerationStructureTrianglesDisplacementMicromapNV;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// VK_AMDX_dense_geometry_format is a preprocessor guard. Do not pass it to API calls.
|
||||||
|
#define VK_AMDX_dense_geometry_format 1
|
||||||
|
#define VK_AMDX_DENSE_GEOMETRY_FORMAT_SPEC_VERSION 1
|
||||||
|
#define VK_AMDX_DENSE_GEOMETRY_FORMAT_EXTENSION_NAME "VK_AMDX_dense_geometry_format"
|
||||||
|
#define VK_COMPRESSED_TRIANGLE_FORMAT_DGF1_BYTE_ALIGNMENT_AMDX 128U
|
||||||
|
#define VK_COMPRESSED_TRIANGLE_FORMAT_DGF1_BYTE_STRIDE_AMDX 128U
|
||||||
|
|
||||||
|
typedef enum VkCompressedTriangleFormatAMDX {
|
||||||
|
VK_COMPRESSED_TRIANGLE_FORMAT_DGF1_AMDX = 0,
|
||||||
|
VK_COMPRESSED_TRIANGLE_FORMAT_MAX_ENUM_AMDX = 0x7FFFFFFF
|
||||||
|
} VkCompressedTriangleFormatAMDX;
|
||||||
|
typedef struct VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX {
|
||||||
|
VkStructureType sType;
|
||||||
|
void* pNext;
|
||||||
|
VkBool32 denseGeometryFormat;
|
||||||
|
} VkPhysicalDeviceDenseGeometryFormatFeaturesAMDX;
|
||||||
|
|
||||||
|
typedef struct VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX {
|
||||||
|
VkStructureType sType;
|
||||||
|
const void* pNext;
|
||||||
|
VkDeviceOrHostAddressConstKHR compressedData;
|
||||||
|
VkDeviceSize dataSize;
|
||||||
|
uint32_t numTriangles;
|
||||||
|
uint32_t numVertices;
|
||||||
|
uint32_t maxPrimitiveIndex;
|
||||||
|
uint32_t maxGeometryIndex;
|
||||||
|
VkCompressedTriangleFormatAMDX format;
|
||||||
|
} VkAccelerationStructureDenseGeometryFormatTrianglesDataAMDX;
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Vendored
+5321
-2494
File diff suppressed because it is too large
Load Diff
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_DIRECTFB_H_ 1
|
#define VULKAN_DIRECTFB_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
Vendored
+4462
-3884
File diff suppressed because it is too large
Load Diff
+3948
-1524
File diff suppressed because it is too large
Load Diff
+6164
-4649
File diff suppressed because one or more lines are too long
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_FUCHSIA_H_ 1
|
#define VULKAN_FUCHSIA_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
Vendored
+22025
-15271
File diff suppressed because it is too large
Load Diff
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_GGP_H_ 1
|
#define VULKAN_GGP_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
+14072
-7543
File diff suppressed because it is too large
Load Diff
Vendored
+7295
-2987
File diff suppressed because it is too large
Load Diff
+75
-46
@@ -1,11 +1,10 @@
|
|||||||
// Copyright 2015-2025 The Khronos Group Inc.
|
// Copyright 2015-2026 The Khronos Group Inc.
|
||||||
//
|
//
|
||||||
// SPDX-License-Identifier: Apache-2.0 OR MIT
|
// SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
//
|
//
|
||||||
|
|
||||||
// This header is generated from the Khronos Vulkan XML API Registry.
|
// This header is generated from the Khronos Vulkan XML API Registry.
|
||||||
|
|
||||||
|
|
||||||
#ifndef VULKAN_HPP_MACROS_HPP
|
#ifndef VULKAN_HPP_MACROS_HPP
|
||||||
#define VULKAN_HPP_MACROS_HPP
|
#define VULKAN_HPP_MACROS_HPP
|
||||||
|
|
||||||
@@ -36,6 +35,18 @@
|
|||||||
# include <ciso646>
|
# include <ciso646>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define VULKAN_HPP_STRINGIFY2( text ) #text
|
||||||
|
#define VULKAN_HPP_STRINGIFY( text ) VULKAN_HPP_STRINGIFY2( text )
|
||||||
|
#define VULKAN_HPP_NAMESPACE_STRING VULKAN_HPP_STRINGIFY( VULKAN_HPP_NAMESPACE )
|
||||||
|
|
||||||
|
#if defined( __clang__ ) || defined( __GNUC__ ) || defined( __GNUG__ )
|
||||||
|
# define VULKAN_HPP_COMPILE_WARNING( text ) _Pragma( VULKAN_HPP_STRINGIFY( GCC warning text ) )
|
||||||
|
#elif defined( _MSC_VER )
|
||||||
|
# define VULKAN_HPP_COMPILE_WARNING( text ) _Pragma( VULKAN_HPP_STRINGIFY( message( __FILE__ "(" VULKAN_HPP_STRINGIFY( __LINE__ ) "): warning: " text ) ) )
|
||||||
|
#else
|
||||||
|
# define VULKAN_HPP_COMPILE_WARNING( text )
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
|
#if defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
|
||||||
# if !defined( VULKAN_HPP_NO_SMART_HANDLE )
|
# if !defined( VULKAN_HPP_NO_SMART_HANDLE )
|
||||||
# define VULKAN_HPP_NO_SMART_HANDLE
|
# define VULKAN_HPP_NO_SMART_HANDLE
|
||||||
@@ -76,6 +87,23 @@
|
|||||||
# define VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL 1
|
# define VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
|
||||||
|
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ ) && !defined( VULKAN_HPP_CXX_MODULE )
|
||||||
|
# include <dlfcn.h>
|
||||||
|
# elif defined( _WIN32 ) && !defined( VULKAN_HPP_NO_WIN32_PROTOTYPES )
|
||||||
|
using HINSTANCE = struct HINSTANCE__ *;
|
||||||
|
# if defined( _WIN64 )
|
||||||
|
# include <cstdint>
|
||||||
|
using FARPROC = int64_t( __stdcall * )();
|
||||||
|
# else
|
||||||
|
using FARPROC = int( __stdcall * )();
|
||||||
|
# endif
|
||||||
|
extern "C" __declspec( dllimport ) HINSTANCE __stdcall LoadLibraryA( char const * lpLibFileName );
|
||||||
|
extern "C" __declspec( dllimport ) int __stdcall FreeLibrary( HINSTANCE hLibModule );
|
||||||
|
extern "C" __declspec( dllimport ) FARPROC __stdcall GetProcAddress( HINSTANCE hModule, char const * lpProcName );
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#if !defined( __has_include )
|
#if !defined( __has_include )
|
||||||
# define __has_include( x ) false
|
# define __has_include( x ) false
|
||||||
#endif
|
#endif
|
||||||
@@ -88,16 +116,23 @@
|
|||||||
# define VULKAN_HPP_SUPPORT_SPAN
|
# define VULKAN_HPP_SUPPORT_SPAN
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined( __cpp_lib_modules ) && !defined( VULKAN_HPP_STD_MODULE ) && defined( VULKAN_HPP_ENABLE_STD_MODULE )
|
#if defined( VULKAN_HPP_CXX_MODULE )
|
||||||
# define VULKAN_HPP_STD_MODULE std.compat
|
# define VULKAN_HPP_EXPORT export
|
||||||
|
#else
|
||||||
|
# define VULKAN_HPP_EXPORT
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined( VULKAN_HPP_CXX_MODULE ) && !( defined( __cpp_modules ) && defined( __cpp_lib_modules ) )
|
||||||
|
VULKAN_HPP_COMPILE_WARNING( "This is a non-conforming implementation of C++ named modules and the standard library module." )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef VK_USE_64_BIT_PTR_DEFINES
|
#ifndef VK_USE_64_BIT_PTR_DEFINES
|
||||||
#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) || (defined(__riscv) && __riscv_xlen == 64)
|
# if defined( __LP64__ ) || defined( _WIN64 ) || ( defined( __x86_64__ ) && !defined( __ILP32__ ) ) || defined( _M_X64 ) || defined( __ia64 ) || \
|
||||||
#define VK_USE_64_BIT_PTR_DEFINES 1
|
defined( _M_IA64 ) || defined( __aarch64__ ) || defined( __powerpc64__ ) || ( defined( __riscv ) && __riscv_xlen == 64 )
|
||||||
#else
|
# define VK_USE_64_BIT_PTR_DEFINES 1
|
||||||
#define VK_USE_64_BIT_PTR_DEFINES 0
|
# else
|
||||||
#endif
|
# define VK_USE_64_BIT_PTR_DEFINES 0
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// 32-bit vulkan is not typesafe for non-dispatchable handles, so don't allow copy constructors on this platform by default.
|
// 32-bit vulkan is not typesafe for non-dispatchable handles, so don't allow copy constructors on this platform by default.
|
||||||
@@ -158,7 +193,12 @@
|
|||||||
# else
|
# else
|
||||||
# define VULKAN_HPP_CONSTEXPR_14
|
# define VULKAN_HPP_CONSTEXPR_14
|
||||||
# endif
|
# endif
|
||||||
# if ( 201907 <= __cpp_constexpr ) && ( !defined( __GNUC__ ) || ( 110400 < GCC_VERSION ) )
|
# if 201603 <= __cpp_constexpr
|
||||||
|
# define VULKAN_HPP_CONSTEXPR_17 constexpr
|
||||||
|
# else
|
||||||
|
# define VULKAN_HPP_CONSTEXPR_17
|
||||||
|
# endif
|
||||||
|
# if ( 201907 <= __cpp_constexpr ) && ( !defined( __GNUC__ ) || ( 120000 <= GCC_VERSION ) )
|
||||||
# define VULKAN_HPP_CONSTEXPR_20 constexpr
|
# define VULKAN_HPP_CONSTEXPR_20 constexpr
|
||||||
# else
|
# else
|
||||||
# define VULKAN_HPP_CONSTEXPR_20
|
# define VULKAN_HPP_CONSTEXPR_20
|
||||||
@@ -216,14 +256,18 @@
|
|||||||
# define VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS
|
# define VULKAN_HPP_NODISCARD_WHEN_NO_EXCEPTIONS
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if 17 <= VULKAN_HPP_CPP_VERSION
|
||||||
|
# define VULKAN_HPP_MAYBE_UNUSED [[maybe_unused]]
|
||||||
|
# define VULKAN_HPP_UNUSED( var )
|
||||||
|
#else
|
||||||
|
# define VULKAN_HPP_MAYBE_UNUSED
|
||||||
|
# define VULKAN_HPP_UNUSED( var ) ( (void)( var ) )
|
||||||
|
#endif
|
||||||
|
|
||||||
#if !defined( VULKAN_HPP_NAMESPACE )
|
#if !defined( VULKAN_HPP_NAMESPACE )
|
||||||
# define VULKAN_HPP_NAMESPACE vk
|
# define VULKAN_HPP_NAMESPACE vk
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define VULKAN_HPP_STRINGIFY2( text ) #text
|
|
||||||
#define VULKAN_HPP_STRINGIFY( text ) VULKAN_HPP_STRINGIFY2( text )
|
|
||||||
#define VULKAN_HPP_NAMESPACE_STRING VULKAN_HPP_STRINGIFY( VULKAN_HPP_NAMESPACE )
|
|
||||||
|
|
||||||
#if !defined( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC )
|
#if !defined( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC )
|
||||||
# if defined( VK_NO_PROTOTYPES )
|
# if defined( VK_NO_PROTOTYPES )
|
||||||
# define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1
|
# define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1
|
||||||
@@ -255,19 +299,20 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace VULKAN_HPP_NAMESPACE
|
#if !defined( VULKAN_HPP_DISPATCH_LOADER_DYNAMIC_TYPE )
|
||||||
{
|
# define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC_TYPE VULKAN_HPP_NAMESPACE::detail::DispatchLoaderDynamic
|
||||||
namespace detail
|
#endif
|
||||||
{
|
#if !defined( VULKAN_HPP_DISPATCH_LOADER_STATIC_TYPE )
|
||||||
class DispatchLoaderDynamic;
|
# define VULKAN_HPP_DISPATCH_LOADER_STATIC_TYPE VULKAN_HPP_NAMESPACE::detail::DispatchLoaderStatic
|
||||||
|
#endif
|
||||||
|
|
||||||
#if !defined( VULKAN_HPP_DEFAULT_DISPATCHER )
|
#if !defined( VULKAN_HPP_DEFAULT_DISPATCHER_TYPE )
|
||||||
# if VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1
|
# if VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1
|
||||||
extern VULKAN_HPP_STORAGE_API DispatchLoaderDynamic defaultDispatchLoaderDynamic;
|
# define VULKAN_HPP_DEFAULT_DISPATCHER_TYPE VULKAN_HPP_DISPATCH_LOADER_DYNAMIC_TYPE
|
||||||
|
# else
|
||||||
|
# define VULKAN_HPP_DEFAULT_DISPATCHER_TYPE VULKAN_HPP_DISPATCH_LOADER_STATIC_TYPE
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
} // namespace detail
|
|
||||||
} // namespace VULKAN_HPP_NAMESPACE
|
|
||||||
|
|
||||||
#if !defined( VULKAN_HPP_DEFAULT_DISPATCHER )
|
#if !defined( VULKAN_HPP_DEFAULT_DISPATCHER )
|
||||||
# if VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1
|
# if VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1
|
||||||
@@ -284,27 +329,18 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
# define VULKAN_HPP_DEFAULT_DISPATCHER ::VULKAN_HPP_NAMESPACE::detail::getDispatchLoaderStatic()
|
# define VULKAN_HPP_DEFAULT_DISPATCHER ::VULKAN_HPP_NAMESPACE::detail::getDispatchLoaderStatic()
|
||||||
# define VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
|
# define VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#else
|
||||||
|
# define VULKAN_HPP_DEFAULT_DISPATCHER_HANDLED
|
||||||
#if !defined( VULKAN_HPP_DEFAULT_DISPATCHER_TYPE )
|
|
||||||
# if VULKAN_HPP_DISPATCH_LOADER_DYNAMIC == 1
|
|
||||||
# define VULKAN_HPP_DEFAULT_DISPATCHER_TYPE ::VULKAN_HPP_NAMESPACE::detail::DispatchLoaderDynamic
|
|
||||||
# else
|
|
||||||
# define VULKAN_HPP_DEFAULT_DISPATCHER_TYPE ::VULKAN_HPP_NAMESPACE::detail::DispatchLoaderStatic
|
|
||||||
# endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined( VULKAN_HPP_NO_DEFAULT_DISPATCHER )
|
#if defined( VULKAN_HPP_NO_DEFAULT_DISPATCHER )
|
||||||
# define VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT
|
# define VULKAN_HPP_DEFAULT_ASSIGNMENT( assignment )
|
||||||
# define VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT
|
|
||||||
# define VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT
|
|
||||||
#else
|
#else
|
||||||
# define VULKAN_HPP_DEFAULT_ARGUMENT_ASSIGNMENT = {}
|
# define VULKAN_HPP_DEFAULT_ASSIGNMENT( assignment ) = assignment
|
||||||
# define VULKAN_HPP_DEFAULT_ARGUMENT_NULLPTR_ASSIGNMENT = nullptr
|
|
||||||
# define VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT = VULKAN_HPP_DEFAULT_DISPATCHER
|
|
||||||
#endif
|
#endif
|
||||||
|
#define VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT VULKAN_HPP_DEFAULT_ASSIGNMENT( VULKAN_HPP_DEFAULT_DISPATCHER )
|
||||||
|
|
||||||
#if !defined( VULKAN_HPP_EXPECTED ) && ( 23 <= VULKAN_HPP_CPP_VERSION ) && defined( __cpp_lib_expected )
|
#if !defined( VULKAN_HPP_EXPECTED ) && ( 23 <= VULKAN_HPP_CPP_VERSION ) && defined( __cpp_lib_expected ) && defined( VULKAN_HPP_USE_STD_EXPECTED )
|
||||||
# if !( defined( VULKAN_HPP_ENABLE_STD_MODULE ) && defined( VULKAN_HPP_STD_MODULE ) )
|
# if !( defined( VULKAN_HPP_ENABLE_STD_MODULE ) && defined( VULKAN_HPP_STD_MODULE ) )
|
||||||
# include <expected>
|
# include <expected>
|
||||||
# endif
|
# endif
|
||||||
@@ -314,14 +350,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
|
|
||||||
#if !defined( VULKAN_HPP_RAII_NAMESPACE )
|
#if !defined( VULKAN_HPP_RAII_NAMESPACE )
|
||||||
# define VULKAN_HPP_RAII_NAMESPACE raii
|
# define VULKAN_HPP_RAII_NAMESPACE raii
|
||||||
|
# define VULKAN_HPP_RAII_NAMESPACE_STRING VULKAN_HPP_STRINGIFY( VULKAN_HPP_NAMESPACE::VULKAN_HPP_RAII_NAMESPACE )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined( VULKAN_HPP_NO_EXCEPTIONS ) && defined( VULKAN_HPP_EXPECTED )
|
|
||||||
# define VULKAN_HPP_RAII_NO_EXCEPTIONS
|
|
||||||
# define VULKAN_HPP_RAII_CREATE_NOEXCEPT noexcept
|
|
||||||
#else
|
|
||||||
# define VULKAN_HPP_RAII_CREATE_NOEXCEPT
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_IOS_H_ 1
|
#define VULKAN_IOS_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_MACOS_H_ 1
|
#define VULKAN_MACOS_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_METAL_H_ 1
|
#define VULKAN_METAL_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
Vendored
+72
-5
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_OHOS_H_ 1
|
#define VULKAN_OHOS_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@@ -19,20 +19,87 @@ extern "C" {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// VK_OHOS_external_memory is a preprocessor guard. Do not pass it to API calls.
|
||||||
|
#define VK_OHOS_external_memory 1
|
||||||
|
struct OH_NativeBuffer;
|
||||||
|
#define VK_OHOS_EXTERNAL_MEMORY_SPEC_VERSION 1
|
||||||
|
#define VK_OHOS_EXTERNAL_MEMORY_EXTENSION_NAME "VK_OHOS_external_memory"
|
||||||
|
typedef struct VkNativeBufferUsageOHOS {
|
||||||
|
VkStructureType sType;
|
||||||
|
void* pNext;
|
||||||
|
uint64_t OHOSNativeBufferUsage;
|
||||||
|
} VkNativeBufferUsageOHOS;
|
||||||
|
|
||||||
|
typedef struct VkNativeBufferPropertiesOHOS {
|
||||||
|
VkStructureType sType;
|
||||||
|
void* pNext;
|
||||||
|
VkDeviceSize allocationSize;
|
||||||
|
uint32_t memoryTypeBits;
|
||||||
|
} VkNativeBufferPropertiesOHOS;
|
||||||
|
|
||||||
|
typedef struct VkNativeBufferFormatPropertiesOHOS {
|
||||||
|
VkStructureType sType;
|
||||||
|
void* pNext;
|
||||||
|
VkFormat format;
|
||||||
|
uint64_t externalFormat;
|
||||||
|
VkFormatFeatureFlags formatFeatures;
|
||||||
|
VkComponentMapping samplerYcbcrConversionComponents;
|
||||||
|
VkSamplerYcbcrModelConversion suggestedYcbcrModel;
|
||||||
|
VkSamplerYcbcrRange suggestedYcbcrRange;
|
||||||
|
VkChromaLocation suggestedXChromaOffset;
|
||||||
|
VkChromaLocation suggestedYChromaOffset;
|
||||||
|
} VkNativeBufferFormatPropertiesOHOS;
|
||||||
|
|
||||||
|
typedef struct VkImportNativeBufferInfoOHOS {
|
||||||
|
VkStructureType sType;
|
||||||
|
const void* pNext;
|
||||||
|
struct OH_NativeBuffer* buffer;
|
||||||
|
} VkImportNativeBufferInfoOHOS;
|
||||||
|
|
||||||
|
typedef struct VkMemoryGetNativeBufferInfoOHOS {
|
||||||
|
VkStructureType sType;
|
||||||
|
const void* pNext;
|
||||||
|
VkDeviceMemory memory;
|
||||||
|
} VkMemoryGetNativeBufferInfoOHOS;
|
||||||
|
|
||||||
|
typedef struct VkExternalFormatOHOS {
|
||||||
|
VkStructureType sType;
|
||||||
|
void* pNext;
|
||||||
|
uint64_t externalFormat;
|
||||||
|
} VkExternalFormatOHOS;
|
||||||
|
|
||||||
|
typedef VkResult (VKAPI_PTR *PFN_vkGetNativeBufferPropertiesOHOS)(VkDevice device, const struct OH_NativeBuffer* buffer, VkNativeBufferPropertiesOHOS* pProperties);
|
||||||
|
typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryNativeBufferOHOS)(VkDevice device, const VkMemoryGetNativeBufferInfoOHOS* pInfo, struct OH_NativeBuffer** pBuffer);
|
||||||
|
|
||||||
|
#ifndef VK_NO_PROTOTYPES
|
||||||
|
#ifndef VK_ONLY_EXPORTED_PROTOTYPES
|
||||||
|
VKAPI_ATTR VkResult VKAPI_CALL vkGetNativeBufferPropertiesOHOS(
|
||||||
|
VkDevice device,
|
||||||
|
const struct OH_NativeBuffer* buffer,
|
||||||
|
VkNativeBufferPropertiesOHOS* pProperties);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef VK_ONLY_EXPORTED_PROTOTYPES
|
||||||
|
VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryNativeBufferOHOS(
|
||||||
|
VkDevice device,
|
||||||
|
const VkMemoryGetNativeBufferInfoOHOS* pInfo,
|
||||||
|
struct OH_NativeBuffer** pBuffer);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// VK_OHOS_surface is a preprocessor guard. Do not pass it to API calls.
|
// VK_OHOS_surface is a preprocessor guard. Do not pass it to API calls.
|
||||||
#define VK_OHOS_surface 1
|
#define VK_OHOS_surface 1
|
||||||
typedef struct NativeWindow OHNativeWindow;
|
typedef struct NativeWindow OHNativeWindow;
|
||||||
#define VK_OHOS_SURFACE_SPEC_VERSION 1
|
#define VK_OHOS_SURFACE_SPEC_VERSION 1
|
||||||
#define VK_OHOS_SURFACE_EXTENSION_NAME "VK_OHOS_surface"
|
#define VK_OHOS_SURFACE_EXTENSION_NAME "VK_OHOS_surface"
|
||||||
typedef VkFlags VkSurfaceCreateFlagsOHOS;
|
typedef VkFlags VkSurfaceCreateFlagsOHOS;
|
||||||
typedef struct VkOHSurfaceCreateInfoOHOS {
|
typedef struct VkSurfaceCreateInfoOHOS {
|
||||||
VkStructureType sType;
|
VkStructureType sType;
|
||||||
const void* pNext;
|
const void* pNext;
|
||||||
VkSurfaceCreateFlagsOHOS flags;
|
VkSurfaceCreateFlagsOHOS flags;
|
||||||
OHNativeWindow* window;
|
OHNativeWindow* window;
|
||||||
} VkOHSurfaceCreateInfoOHOS;
|
} VkSurfaceCreateInfoOHOS;
|
||||||
|
|
||||||
typedef VkOHSurfaceCreateInfoOHOS VkSurfaceCreateInfoOHOS;
|
|
||||||
|
|
||||||
typedef VkResult (VKAPI_PTR *PFN_vkCreateSurfaceOHOS)(VkInstance instance, const VkSurfaceCreateInfoOHOS* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
|
typedef VkResult (VKAPI_PTR *PFN_vkCreateSurfaceOHOS)(VkInstance instance, const VkSurfaceCreateInfoOHOS* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
|
||||||
|
|
||||||
|
|||||||
Vendored
+15967
-10840
File diff suppressed because it is too large
Load Diff
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_SCREEN_H_ 1
|
#define VULKAN_SCREEN_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
Vendored
+479
-377
File diff suppressed because it is too large
Load Diff
+8218
-3721
File diff suppressed because it is too large
Load Diff
+113242
-53635
File diff suppressed because one or more lines are too long
+5043
-3421
File diff suppressed because it is too large
Load Diff
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_VI_H_ 1
|
#define VULKAN_VI_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
Vendored
+60
-159
@@ -1,171 +1,72 @@
|
|||||||
// Copyright 2021-2025 The Khronos Group Inc.
|
// Copyright 2021-2026 The Khronos Group Inc.
|
||||||
// SPDX-License-Identifier: Apache-2.0 OR MIT
|
// SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
//
|
//
|
||||||
|
|
||||||
// This header is generated from the Khronos Vulkan XML API Registry.
|
// This header is generated from the Khronos Vulkan XML API Registry.
|
||||||
|
|
||||||
// Note: This module is still in an experimental state.
|
|
||||||
// Any feedback is welcome on https://github.com/KhronosGroup/Vulkan-Hpp/issues.
|
|
||||||
|
|
||||||
module;
|
module;
|
||||||
|
|
||||||
#include <vulkan/vulkan_hpp_macros.hpp>
|
#define VULKAN_HPP_CXX_MODULE 1
|
||||||
|
|
||||||
#if defined( __cpp_lib_modules ) && !defined( VULKAN_HPP_ENABLE_STD_MODULE )
|
#if __has_include( <vk_video/vulkan_video_codecs_common.h> )
|
||||||
# define VULKAN_HPP_ENABLE_STD_MODULE
|
# include <vk_video/vulkan_video_codecs_common.h>
|
||||||
|
#endif
|
||||||
|
#if __has_include( <vk_video/vulkan_video_codec_h264std.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_h264std.h>
|
||||||
|
#endif
|
||||||
|
#if __has_include( <vk_video/vulkan_video_codec_h264std_decode.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_h264std_decode.h>
|
||||||
|
#endif
|
||||||
|
#if __has_include( <vk_video/vulkan_video_codec_h264std_encode.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_h264std_encode.h>
|
||||||
|
#endif
|
||||||
|
#if __has_include( <vk_video/vulkan_video_codec_h265std.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_h265std.h>
|
||||||
|
#endif
|
||||||
|
#if __has_include( <vk_video/vulkan_video_codec_h265std_decode.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_h265std_decode.h>
|
||||||
|
#endif
|
||||||
|
#if __has_include( <vk_video/vulkan_video_codec_h265std_encode.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_h265std_encode.h>
|
||||||
|
#endif
|
||||||
|
#if __has_include( <vk_video/vulkan_video_codec_vp9std.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_vp9std.h>
|
||||||
|
#endif
|
||||||
|
#if __has_include( <vk_video/vulkan_video_codec_vp9std_decode.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_vp9std_decode.h>
|
||||||
|
#endif
|
||||||
|
#if __has_include( <vk_video/vulkan_video_codec_av1std.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_av1std.h>
|
||||||
|
#endif
|
||||||
|
#if __has_include( <vk_video/vulkan_video_codec_av1std_decode.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_av1std_decode.h>
|
||||||
|
#endif
|
||||||
|
#if __has_include( <vk_video/vulkan_video_codec_av1std_encode.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_av1std_encode.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// clang-format off
|
||||||
|
#include <vulkan/vulkan_hpp_macros.hpp>
|
||||||
|
// clang-format on
|
||||||
|
|
||||||
|
export module vulkan_video;
|
||||||
|
|
||||||
|
import vulkan;
|
||||||
|
|
||||||
|
#if defined( _MSC_VER )
|
||||||
|
# pragma warning( push )
|
||||||
|
# pragma warning( disable : 5244 )
|
||||||
|
#elif defined( __clang__ )
|
||||||
|
# pragma clang diagnostic push
|
||||||
|
# pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
|
||||||
|
#elif defined( __GNUC__ )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <vulkan/vulkan_video.hpp>
|
#include <vulkan/vulkan_video.hpp>
|
||||||
|
|
||||||
export module vulkan_video_hpp;
|
#if defined( _MSC_VER )
|
||||||
|
# pragma warning( pop )
|
||||||
export namespace VULKAN_HPP_NAMESPACE
|
#elif defined( __clang__ )
|
||||||
{
|
# pragma clang diagnostic pop
|
||||||
namespace VULKAN_HPP_VIDEO_NAMESPACE
|
#elif defined( __GNUC__ )
|
||||||
{
|
#endif
|
||||||
|
|
||||||
//=============
|
|
||||||
//=== ENUMs ===
|
|
||||||
//=============
|
|
||||||
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ChromaSamplePosition;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ColorPrimaries;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameRestorationType;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameType;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1InterpolationFilter;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Level;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1MatrixCoefficients;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Profile;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ReferenceName;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TransferCharacteristics;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264FieldOrderCount;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264AspectRatioIdc;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264CabacInitIdc;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ChromaFormatIdc;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264DisableDeblockingFilterIdc;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264LevelIdc;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264MemMgmtControlOp;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ModificationOfPicNumsIdc;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264NonVclNaluType;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264PictureType;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264PocType;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ProfileIdc;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SliceType;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264WeightedBipredIdc;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265AspectRatioIdc;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ChromaFormatIdc;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265LevelIdc;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PictureType;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ProfileIdc;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SliceType;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ColorSpace;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9FrameType;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9InterpolationFilter;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9Level;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9Profile;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ReferenceName;
|
|
||||||
|
|
||||||
//===============
|
|
||||||
//=== STRUCTS ===
|
|
||||||
//===============
|
|
||||||
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1CDEF;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ColorConfig;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ColorConfigFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FilmGrain;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FilmGrainFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1GlobalMotion;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilter;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilterFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopRestoration;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Quantization;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1QuantizationFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Segmentation;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1SequenceHeader;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1SequenceHeaderFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TimingInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TimingInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeAV1PictureInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeAV1PictureInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeAV1ReferenceInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeAV1ReferenceInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264PictureInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264PictureInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264ReferenceInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264ReferenceInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265PictureInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265PictureInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265ReferenceInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH265ReferenceInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeVP9PictureInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeVP9PictureInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1DecoderModelInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ExtensionHeader;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1OperatingPointInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1OperatingPointInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1PictureInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1PictureInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ReferenceInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ReferenceInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264PictureInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264PictureInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceListsInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceListsInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264RefListModEntry;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264RefPicMarkingEntry;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264SliceHeader;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264SliceHeaderFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264WeightTable;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264WeightTableFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265LongTermRefPics;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265PictureInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265PictureInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceListsInfo;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceListsInfoFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265SliceSegmentHeader;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265SliceSegmentHeaderFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265WeightTable;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265WeightTableFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264HrdParameters;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264PictureParameterSet;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264PpsFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingLists;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SequenceParameterSet;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SequenceParameterSetVui;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SpsFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SpsVuiFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265DecPicBufMgr;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265HrdFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265HrdParameters;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265LongTermRefPicsSps;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PictureParameterSet;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PpsFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PredictorPaletteEntries;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ProfileTierLevel;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ProfileTierLevelFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingLists;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SequenceParameterSet;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SequenceParameterSetVui;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ShortTermRefPicSet;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ShortTermRefPicSetFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SpsFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SpsVuiFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SubLayerHrdParameters;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265VideoParameterSet;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265VpsFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ColorConfig;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ColorConfigFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9LoopFilter;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9LoopFilterFlags;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9Segmentation;
|
|
||||||
using VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9SegmentationFlags;
|
|
||||||
|
|
||||||
} // namespace VULKAN_HPP_VIDEO_NAMESPACE
|
|
||||||
} // namespace VULKAN_HPP_NAMESPACE
|
|
||||||
|
|||||||
Vendored
+301
-184
@@ -1,4 +1,4 @@
|
|||||||
// Copyright 2021-2025 The Khronos Group Inc.
|
// Copyright 2021-2026 The Khronos Group Inc.
|
||||||
// SPDX-License-Identifier: Apache-2.0 OR MIT
|
// SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
//
|
//
|
||||||
|
|
||||||
@@ -7,31 +7,150 @@
|
|||||||
#ifndef VULKAN_VIDEO_HPP
|
#ifndef VULKAN_VIDEO_HPP
|
||||||
#define VULKAN_VIDEO_HPP
|
#define VULKAN_VIDEO_HPP
|
||||||
|
|
||||||
// clang-format off
|
// here, we consider include files to be available when __has_include is not defined
|
||||||
#include <vulkan/vulkan.hpp>
|
#if !defined( __has_include )
|
||||||
// clang-format on
|
# define __has_include( x ) true
|
||||||
|
# define has_include_was_not_defined
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <vk_video/vulkan_video_codec_av1std.h>
|
#if !defined( VULKAN_HPP_CXX_MODULE )
|
||||||
#include <vk_video/vulkan_video_codec_av1std_decode.h>
|
# include <vulkan/vulkan.hpp>
|
||||||
#include <vk_video/vulkan_video_codec_av1std_encode.h>
|
# if __has_include( <vk_video/vulkan_video_codecs_common.h> )
|
||||||
#include <vk_video/vulkan_video_codec_h264std.h>
|
# include <vk_video/vulkan_video_codecs_common.h>
|
||||||
#include <vk_video/vulkan_video_codec_h264std_decode.h>
|
# endif
|
||||||
#include <vk_video/vulkan_video_codec_h264std_encode.h>
|
# if __has_include( <vk_video/vulkan_video_codec_h264std.h> )
|
||||||
#include <vk_video/vulkan_video_codec_h265std.h>
|
# include <vk_video/vulkan_video_codec_h264std.h>
|
||||||
#include <vk_video/vulkan_video_codec_h265std_decode.h>
|
# endif
|
||||||
#include <vk_video/vulkan_video_codec_h265std_encode.h>
|
# if __has_include( <vk_video/vulkan_video_codec_h264std_decode.h> )
|
||||||
#include <vk_video/vulkan_video_codec_vp9std.h>
|
# include <vk_video/vulkan_video_codec_h264std_decode.h>
|
||||||
#include <vk_video/vulkan_video_codec_vp9std_decode.h>
|
# endif
|
||||||
#include <vk_video/vulkan_video_codecs_common.h>
|
# if __has_include( <vk_video/vulkan_video_codec_h264std_encode.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_h264std_encode.h>
|
||||||
|
# endif
|
||||||
|
# if __has_include( <vk_video/vulkan_video_codec_h265std.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_h265std.h>
|
||||||
|
# endif
|
||||||
|
# if __has_include( <vk_video/vulkan_video_codec_h265std_decode.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_h265std_decode.h>
|
||||||
|
# endif
|
||||||
|
# if __has_include( <vk_video/vulkan_video_codec_h265std_encode.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_h265std_encode.h>
|
||||||
|
# endif
|
||||||
|
# if __has_include( <vk_video/vulkan_video_codec_vp9std.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_vp9std.h>
|
||||||
|
# endif
|
||||||
|
# if __has_include( <vk_video/vulkan_video_codec_vp9std_decode.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_vp9std_decode.h>
|
||||||
|
# endif
|
||||||
|
# if __has_include( <vk_video/vulkan_video_codec_av1std.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_av1std.h>
|
||||||
|
# endif
|
||||||
|
# if __has_include( <vk_video/vulkan_video_codec_av1std_decode.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_av1std_decode.h>
|
||||||
|
# endif
|
||||||
|
# if __has_include( <vk_video/vulkan_video_codec_av1std_encode.h> )
|
||||||
|
# include <vk_video/vulkan_video_codec_av1std_encode.h>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
#if !defined( VULKAN_HPP_VIDEO_NAMESPACE )
|
#if !defined( VULKAN_HPP_VIDEO_NAMESPACE )
|
||||||
# define VULKAN_HPP_VIDEO_NAMESPACE video
|
# define VULKAN_HPP_VIDEO_NAMESPACE video
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace VULKAN_HPP_NAMESPACE
|
VULKAN_HPP_EXPORT namespace VULKAN_HPP_NAMESPACE
|
||||||
{
|
{
|
||||||
namespace VULKAN_HPP_VIDEO_NAMESPACE
|
namespace VULKAN_HPP_VIDEO_NAMESPACE
|
||||||
{
|
{
|
||||||
|
//=================
|
||||||
|
//=== CONSTANTs ===
|
||||||
|
//=================
|
||||||
|
|
||||||
|
#if defined( VULKAN_VIDEO_CODEC_H264STD_H_ )
|
||||||
|
//=== vulkan_video_codec_h264std ===
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264CpbCntListSize = 32;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264MaxChromaPlanes = 2;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264MaxNumListRef = 32;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint8_t H264NoReferencePicture = 0xFF;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264ScalingList4X4NumElements = 16;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264ScalingList4X4NumLists = 6;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264ScalingList8X8NumElements = 64;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H264ScalingList8X8NumLists = 6;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined( VULKAN_VIDEO_CODEC_H264STD_DECODE_H_ )
|
||||||
|
//=== vulkan_video_codec_h264std_decode ===
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t DecodeH264FieldOrderCountListSize = 2;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined( VULKAN_VIDEO_CODEC_H265STD_H_ )
|
||||||
|
//=== vulkan_video_codec_h265std ===
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ChromaQpOffsetListSize = 6;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ChromaQpOffsetTileColsListSize = 19;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ChromaQpOffsetTileRowsListSize = 21;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265CpbCntListSize = 32;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxChromaPlanes = 2;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxDeltaPoc = 48;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxDpbSize = 16;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxLongTermPics = 16;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxLongTermRefPicsSps = 32;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxNumListRef = 15;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265MaxShortTermRefPicSets = 64;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint8_t H265NoReferencePicture = 0xFF;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265PredictorPaletteComponentsListSize = 3;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265PredictorPaletteCompEntriesListSize = 128;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList16X16NumElements = 64;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList16X16NumLists = 6;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList32X32NumElements = 64;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList32X32NumLists = 2;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList4X4NumElements = 16;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList4X4NumLists = 6;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList8X8NumElements = 64;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265ScalingList8X8NumLists = 6;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t H265SublayersListSize = 7;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined( VULKAN_VIDEO_CODEC_H265STD_DECODE_H_ )
|
||||||
|
//=== vulkan_video_codec_h265std_decode ===
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t DecodeH265RefPicSetListSize = 8;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined( VULKAN_VIDEO_CODEC_VP9STD_H_ )
|
||||||
|
//=== vulkan_video_codec_vp9std ===
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9LoopFilterAdjustments = 2;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9MaxRefFrames = 4;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9MaxSegmentationPredProb = 3;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9MaxSegmentationTreeProbs = 7;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9MaxSegments = 8;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9NumRefFrames = 8;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9RefsPerFrame = 3;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Vp9SegLvlMax = 4;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined( VULKAN_VIDEO_CODEC_AV1STD_H_ )
|
||||||
|
//=== vulkan_video_codec_av1std ===
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1GlobalMotionParams = 6;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1LoopFilterAdjustments = 2;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxCdefFilterStrengths = 8;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxLoopFilterStrengths = 4;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumCbPoints = 10;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumCrPoints = 10;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumPlanes = 3;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumPosChroma = 25;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumPosLuma = 24;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxNumYPoints = 14;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxSegments = 8;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxTileCols = 64;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1MaxTileRows = 64;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1NumRefFrames = 8;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint8_t Av1PrimaryRefNone = 7;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1RefsPerFrame = 7;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1SegLvlMax = 8;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint8_t Av1SelectIntegerMv = 2;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1SelectScreenContentTools = 2;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1SkipModeFrames = 2;
|
||||||
|
VULKAN_HPP_CONSTEXPR_INLINE uint32_t Av1TotalRefsPerFrame = 8;
|
||||||
|
#endif
|
||||||
|
|
||||||
//=============
|
//=============
|
||||||
//=== ENUMs ===
|
//=== ENUMs ===
|
||||||
@@ -619,9 +738,9 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint8_t bit_rate_scale = {};
|
uint8_t bit_rate_scale = {};
|
||||||
uint8_t cpb_size_scale = {};
|
uint8_t cpb_size_scale = {};
|
||||||
uint8_t reserved1 = {};
|
uint8_t reserved1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE> bit_rate_value_minus1 = {};
|
ArrayWrapper1D<uint32_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE> bit_rate_value_minus1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE> cpb_size_value_minus1 = {};
|
ArrayWrapper1D<uint32_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE> cpb_size_value_minus1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE> cbr_flag = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_H264_CPB_CNT_LIST_SIZE> cbr_flag = {};
|
||||||
uint32_t initial_cpb_removal_delay_length_minus1 = {};
|
uint32_t initial_cpb_removal_delay_length_minus1 = {};
|
||||||
uint32_t cpb_removal_delay_length_minus1 = {};
|
uint32_t cpb_removal_delay_length_minus1 = {};
|
||||||
uint32_t dpb_output_delay_length_minus1 = {};
|
uint32_t dpb_output_delay_length_minus1 = {};
|
||||||
@@ -685,7 +804,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint8_t chroma_sample_loc_type_top_field = {};
|
uint8_t chroma_sample_loc_type_top_field = {};
|
||||||
uint8_t chroma_sample_loc_type_bottom_field = {};
|
uint8_t chroma_sample_loc_type_bottom_field = {};
|
||||||
uint32_t reserved1 = {};
|
uint32_t reserved1 = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264HrdParameters * pHrdParameters = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264HrdParameters const * pHrdParameters = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct H264SpsFlags
|
struct H264SpsFlags
|
||||||
@@ -787,10 +906,8 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
public:
|
public:
|
||||||
uint16_t scaling_list_present_mask = {};
|
uint16_t scaling_list_present_mask = {};
|
||||||
uint16_t use_default_scaling_matrix_mask = {};
|
uint16_t use_default_scaling_matrix_mask = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS, STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS>
|
ArrayWrapper2D<uint8_t, STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS, STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS> ScalingList4x4 = {};
|
||||||
ScalingList4x4 = {};
|
ArrayWrapper2D<uint8_t, STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS, STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS> ScalingList8x8 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS, STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS>
|
|
||||||
ScalingList8x8 = {};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct H264SequenceParameterSet
|
struct H264SequenceParameterSet
|
||||||
@@ -864,9 +981,9 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint32_t frame_crop_top_offset = {};
|
uint32_t frame_crop_top_offset = {};
|
||||||
uint32_t frame_crop_bottom_offset = {};
|
uint32_t frame_crop_bottom_offset = {};
|
||||||
uint32_t reserved2 = {};
|
uint32_t reserved2 = {};
|
||||||
const int32_t * pOffsetForRefFrame = {};
|
int32_t const * pOffsetForRefFrame = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingLists * pScalingLists = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingLists const * pScalingLists = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SequenceParameterSetVui * pSequenceParameterSetVui = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264SequenceParameterSetVui const * pSequenceParameterSetVui = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct H264PpsFlags
|
struct H264PpsFlags
|
||||||
@@ -969,7 +1086,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
int8_t pic_init_qs_minus26 = {};
|
int8_t pic_init_qs_minus26 = {};
|
||||||
int8_t chroma_qp_index_offset = {};
|
int8_t chroma_qp_index_offset = {};
|
||||||
int8_t second_chroma_qp_index_offset = {};
|
int8_t second_chroma_qp_index_offset = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingLists * pScalingLists = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264ScalingLists const * pScalingLists = {};
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1065,7 +1182,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint8_t reserved2 = {};
|
uint8_t reserved2 = {};
|
||||||
uint16_t frame_num = {};
|
uint16_t frame_num = {};
|
||||||
uint16_t idr_pic_id = {};
|
uint16_t idr_pic_id = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int32_t, STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE> PicOrderCnt = {};
|
ArrayWrapper1D<int32_t, STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE> PicOrderCnt = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct DecodeH264ReferenceInfoFlags
|
struct DecodeH264ReferenceInfoFlags
|
||||||
@@ -1148,7 +1265,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264ReferenceInfoFlags flags = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::DecodeH264ReferenceInfoFlags flags = {};
|
||||||
uint16_t FrameNum = {};
|
uint16_t FrameNum = {};
|
||||||
uint16_t reserved = {};
|
uint16_t reserved = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int32_t, STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE> PicOrderCnt = {};
|
ArrayWrapper1D<int32_t, STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE> PicOrderCnt = {};
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1239,14 +1356,14 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264WeightTableFlags flags = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264WeightTableFlags flags = {};
|
||||||
uint8_t luma_log2_weight_denom = {};
|
uint8_t luma_log2_weight_denom = {};
|
||||||
uint8_t chroma_log2_weight_denom = {};
|
uint8_t chroma_log2_weight_denom = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF> luma_weight_l0 = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF> luma_weight_l0 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF> luma_offset_l0 = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF> luma_offset_l0 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_weight_l0 = {};
|
ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_weight_l0 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_offset_l0 = {};
|
ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_offset_l0 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF> luma_weight_l1 = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF> luma_weight_l1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF> luma_offset_l1 = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF> luma_offset_l1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_weight_l1 = {};
|
ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_weight_l1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_offset_l1 = {};
|
ArrayWrapper2D<int8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF, STD_VIDEO_H264_MAX_CHROMA_PLANES> chroma_offset_l1 = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct EncodeH264SliceHeaderFlags
|
struct EncodeH264SliceHeaderFlags
|
||||||
@@ -1545,15 +1662,15 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceListsInfoFlags flags = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceListsInfoFlags flags = {};
|
||||||
uint8_t num_ref_idx_l0_active_minus1 = {};
|
uint8_t num_ref_idx_l0_active_minus1 = {};
|
||||||
uint8_t num_ref_idx_l1_active_minus1 = {};
|
uint8_t num_ref_idx_l1_active_minus1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF> RefPicList0 = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF> RefPicList0 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF> RefPicList1 = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_H264_MAX_NUM_LIST_REF> RefPicList1 = {};
|
||||||
uint8_t refList0ModOpCount = {};
|
uint8_t refList0ModOpCount = {};
|
||||||
uint8_t refList1ModOpCount = {};
|
uint8_t refList1ModOpCount = {};
|
||||||
uint8_t refPicMarkingOpCount = {};
|
uint8_t refPicMarkingOpCount = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 7> reserved1 = {};
|
ArrayWrapper1D<uint8_t, 7> reserved1 = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264RefListModEntry * pRefList0ModOperations = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264RefListModEntry const * pRefList0ModOperations = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264RefListModEntry * pRefList1ModOperations = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264RefListModEntry const * pRefList1ModOperations = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264RefPicMarkingEntry * pRefPicMarkingOperations = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264RefPicMarkingEntry const * pRefPicMarkingOperations = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct EncodeH264PictureInfo
|
struct EncodeH264PictureInfo
|
||||||
@@ -1602,8 +1719,8 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint32_t frame_num = {};
|
uint32_t frame_num = {};
|
||||||
int32_t PicOrderCnt = {};
|
int32_t PicOrderCnt = {};
|
||||||
uint8_t temporal_id = {};
|
uint8_t temporal_id = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 3> reserved1 = {};
|
ArrayWrapper1D<uint8_t, 3> reserved1 = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceListsInfo * pRefLists = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264ReferenceListsInfo const * pRefLists = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct EncodeH264ReferenceInfo
|
struct EncodeH264ReferenceInfo
|
||||||
@@ -1701,7 +1818,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264CabacInitIdc::e0;
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264CabacInitIdc::e0;
|
||||||
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264DisableDeblockingFilterIdc disable_deblocking_filter_idc =
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264DisableDeblockingFilterIdc disable_deblocking_filter_idc =
|
||||||
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264DisableDeblockingFilterIdc::eDisabled;
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H264DisableDeblockingFilterIdc::eDisabled;
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264WeightTable * pWeightTable = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH264WeightTable const * pWeightTable = {};
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1744,9 +1861,9 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE> max_latency_increase_plus1 = {};
|
ArrayWrapper1D<uint32_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE> max_latency_increase_plus1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE> max_dec_pic_buffering_minus1 = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE> max_dec_pic_buffering_minus1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE> max_num_reorder_pics = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE> max_num_reorder_pics = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct H265SubLayerHrdParameters
|
struct H265SubLayerHrdParameters
|
||||||
@@ -1786,10 +1903,10 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> bit_rate_value_minus1 = {};
|
ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> bit_rate_value_minus1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> cpb_size_value_minus1 = {};
|
ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> cpb_size_value_minus1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> cpb_size_du_value_minus1 = {};
|
ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> cpb_size_du_value_minus1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> bit_rate_du_value_minus1 = {};
|
ArrayWrapper1D<uint32_t, STD_VIDEO_H265_CPB_CNT_LIST_SIZE> bit_rate_du_value_minus1 = {};
|
||||||
uint32_t cbr_flag = {};
|
uint32_t cbr_flag = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1895,11 +2012,11 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint8_t initial_cpb_removal_delay_length_minus1 = {};
|
uint8_t initial_cpb_removal_delay_length_minus1 = {};
|
||||||
uint8_t au_cpb_removal_delay_length_minus1 = {};
|
uint8_t au_cpb_removal_delay_length_minus1 = {};
|
||||||
uint8_t dpb_output_delay_length_minus1 = {};
|
uint8_t dpb_output_delay_length_minus1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE> cpb_cnt_minus1 = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE> cpb_cnt_minus1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE> elemental_duration_in_tc_minus1 = {};
|
ArrayWrapper1D<uint16_t, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE> elemental_duration_in_tc_minus1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, 3> reserved = {};
|
ArrayWrapper1D<uint16_t, 3> reserved = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SubLayerHrdParameters * pSubLayerHrdParametersNal = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SubLayerHrdParameters const * pSubLayerHrdParametersNal = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SubLayerHrdParameters * pSubLayerHrdParametersVcl = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SubLayerHrdParameters const * pSubLayerHrdParametersVcl = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct H265VpsFlags
|
struct H265VpsFlags
|
||||||
@@ -2080,9 +2197,9 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint32_t vps_time_scale = {};
|
uint32_t vps_time_scale = {};
|
||||||
uint32_t vps_num_ticks_poc_diff_one_minus1 = {};
|
uint32_t vps_num_ticks_poc_diff_one_minus1 = {};
|
||||||
uint32_t reserved3 = {};
|
uint32_t reserved3 = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265DecPicBufMgr * pDecPicBufMgr = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265DecPicBufMgr const * pDecPicBufMgr = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265HrdParameters * pHrdParameters = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265HrdParameters const * pHrdParameters = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ProfileTierLevel * pProfileTierLevel = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ProfileTierLevel const * pProfileTierLevel = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct H265ScalingLists
|
struct H265ScalingLists
|
||||||
@@ -2122,16 +2239,12 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_4X4_NUM_ELEMENTS>
|
ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_4X4_NUM_ELEMENTS> ScalingList4x4 = {};
|
||||||
ScalingList4x4 = {};
|
ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_8X8_NUM_ELEMENTS> ScalingList8x8 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_8X8_NUM_ELEMENTS>
|
ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_ELEMENTS> ScalingList16x16 = {};
|
||||||
ScalingList8x8 = {};
|
ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_ELEMENTS> ScalingList32x32 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_ELEMENTS>
|
ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS> ScalingListDCCoef16x16 = {};
|
||||||
ScalingList16x16 = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS> ScalingListDCCoef32x32 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<uint8_t, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_ELEMENTS>
|
|
||||||
ScalingList32x32 = {};
|
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS> ScalingListDCCoef16x16 = {};
|
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS> ScalingListDCCoef32x32 = {};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct H265SpsVuiFlags
|
struct H265SpsVuiFlags
|
||||||
@@ -2273,7 +2386,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint8_t max_bits_per_min_cu_denom = {};
|
uint8_t max_bits_per_min_cu_denom = {};
|
||||||
uint8_t log2_max_mv_length_horizontal = {};
|
uint8_t log2_max_mv_length_horizontal = {};
|
||||||
uint8_t log2_max_mv_length_vertical = {};
|
uint8_t log2_max_mv_length_vertical = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265HrdParameters * pHrdParameters = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265HrdParameters const * pHrdParameters = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct H265PredictorPaletteEntries
|
struct H265PredictorPaletteEntries
|
||||||
@@ -2311,7 +2424,6 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
VULKAN_HPP_NAMESPACE::
|
|
||||||
ArrayWrapper2D<uint16_t, STD_VIDEO_H265_PREDICTOR_PALETTE_COMPONENTS_LIST_SIZE, STD_VIDEO_H265_PREDICTOR_PALETTE_COMP_ENTRIES_LIST_SIZE>
|
ArrayWrapper2D<uint16_t, STD_VIDEO_H265_PREDICTOR_PALETTE_COMPONENTS_LIST_SIZE, STD_VIDEO_H265_PREDICTOR_PALETTE_COMP_ENTRIES_LIST_SIZE>
|
||||||
PredictorPaletteEntries = {};
|
PredictorPaletteEntries = {};
|
||||||
};
|
};
|
||||||
@@ -2496,8 +2608,8 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint8_t reserved3 = {};
|
uint8_t reserved3 = {};
|
||||||
uint8_t num_negative_pics = {};
|
uint8_t num_negative_pics = {};
|
||||||
uint8_t num_positive_pics = {};
|
uint8_t num_positive_pics = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_H265_MAX_DPB_SIZE> delta_poc_s0_minus1 = {};
|
ArrayWrapper1D<uint16_t, STD_VIDEO_H265_MAX_DPB_SIZE> delta_poc_s0_minus1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_H265_MAX_DPB_SIZE> delta_poc_s1_minus1 = {};
|
ArrayWrapper1D<uint16_t, STD_VIDEO_H265_MAX_DPB_SIZE> delta_poc_s1_minus1 = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct H265LongTermRefPicsSps
|
struct H265LongTermRefPicsSps
|
||||||
@@ -2536,7 +2648,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
uint32_t used_by_curr_pic_lt_sps_flag = {};
|
uint32_t used_by_curr_pic_lt_sps_flag = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS> lt_ref_pic_poc_lsb_sps = {};
|
ArrayWrapper1D<uint32_t, STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS> lt_ref_pic_poc_lsb_sps = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct H265SequenceParameterSet
|
struct H265SequenceParameterSet
|
||||||
@@ -2631,13 +2743,13 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint32_t conf_win_right_offset = {};
|
uint32_t conf_win_right_offset = {};
|
||||||
uint32_t conf_win_top_offset = {};
|
uint32_t conf_win_top_offset = {};
|
||||||
uint32_t conf_win_bottom_offset = {};
|
uint32_t conf_win_bottom_offset = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ProfileTierLevel * pProfileTierLevel = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ProfileTierLevel const * pProfileTierLevel = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265DecPicBufMgr * pDecPicBufMgr = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265DecPicBufMgr const * pDecPicBufMgr = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingLists * pScalingLists = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingLists const * pScalingLists = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ShortTermRefPicSet * pShortTermRefPicSet = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ShortTermRefPicSet const * pShortTermRefPicSet = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265LongTermRefPicsSps * pLongTermRefPicsSps = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265LongTermRefPicsSps const * pLongTermRefPicsSps = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SequenceParameterSetVui * pSequenceParameterSetVui = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265SequenceParameterSetVui const * pSequenceParameterSetVui = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PredictorPaletteEntries * pPredictorPaletteEntries = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PredictorPaletteEntries const * pPredictorPaletteEntries = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct H265PpsFlags
|
struct H265PpsFlags
|
||||||
@@ -2802,8 +2914,8 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint8_t log2_max_transform_skip_block_size_minus2 = {};
|
uint8_t log2_max_transform_skip_block_size_minus2 = {};
|
||||||
uint8_t diff_cu_chroma_qp_offset_depth = {};
|
uint8_t diff_cu_chroma_qp_offset_depth = {};
|
||||||
uint8_t chroma_qp_offset_list_len_minus1 = {};
|
uint8_t chroma_qp_offset_list_len_minus1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE> cb_qp_offset_list = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE> cb_qp_offset_list = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE> cr_qp_offset_list = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE> cr_qp_offset_list = {};
|
||||||
uint8_t log2_sao_offset_scale_luma = {};
|
uint8_t log2_sao_offset_scale_luma = {};
|
||||||
uint8_t log2_sao_offset_scale_chroma = {};
|
uint8_t log2_sao_offset_scale_chroma = {};
|
||||||
int8_t pps_act_y_qp_offset_plus5 = {};
|
int8_t pps_act_y_qp_offset_plus5 = {};
|
||||||
@@ -2816,11 +2928,11 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint8_t num_tile_rows_minus1 = {};
|
uint8_t num_tile_rows_minus1 = {};
|
||||||
uint8_t reserved1 = {};
|
uint8_t reserved1 = {};
|
||||||
uint8_t reserved2 = {};
|
uint8_t reserved2 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_COLS_LIST_SIZE> column_width_minus1 = {};
|
ArrayWrapper1D<uint16_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_COLS_LIST_SIZE> column_width_minus1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_ROWS_LIST_SIZE> row_height_minus1 = {};
|
ArrayWrapper1D<uint16_t, STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_ROWS_LIST_SIZE> row_height_minus1 = {};
|
||||||
uint32_t reserved3 = {};
|
uint32_t reserved3 = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingLists * pScalingLists = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ScalingLists const * pScalingLists = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PredictorPaletteEntries * pPredictorPaletteEntries = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265PredictorPaletteEntries const * pPredictorPaletteEntries = {};
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -2917,9 +3029,9 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
int32_t PicOrderCntVal = {};
|
int32_t PicOrderCntVal = {};
|
||||||
uint16_t NumBitsForSTRefPicSetInSlice = {};
|
uint16_t NumBitsForSTRefPicSetInSlice = {};
|
||||||
uint16_t reserved = {};
|
uint16_t reserved = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE> RefPicSetStCurrBefore = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE> RefPicSetStCurrBefore = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE> RefPicSetStCurrAfter = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE> RefPicSetStCurrAfter = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE> RefPicSetLtCurr = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE> RefPicSetLtCurr = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct DecodeH265ReferenceInfoFlags
|
struct DecodeH265ReferenceInfoFlags
|
||||||
@@ -3089,14 +3201,14 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265WeightTableFlags flags = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265WeightTableFlags flags = {};
|
||||||
uint8_t luma_log2_weight_denom = {};
|
uint8_t luma_log2_weight_denom = {};
|
||||||
int8_t delta_chroma_log2_weight_denom = {};
|
int8_t delta_chroma_log2_weight_denom = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF> delta_luma_weight_l0 = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF> delta_luma_weight_l0 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF> luma_offset_l0 = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF> luma_offset_l0 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_weight_l0 = {};
|
ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_weight_l0 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_offset_l0 = {};
|
ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_offset_l0 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF> delta_luma_weight_l1 = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF> delta_luma_weight_l1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF> luma_offset_l1 = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF> luma_offset_l1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_weight_l1 = {};
|
ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_weight_l1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_offset_l1 = {};
|
ArrayWrapper2D<int8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF, STD_VIDEO_H265_MAX_CHROMA_PLANES> delta_chroma_offset_l1 = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct EncodeH265SliceSegmentHeaderFlags
|
struct EncodeH265SliceSegmentHeaderFlags
|
||||||
@@ -3212,7 +3324,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
int8_t slice_act_cr_qp_offset = {};
|
int8_t slice_act_cr_qp_offset = {};
|
||||||
int8_t slice_qp_delta = {};
|
int8_t slice_qp_delta = {};
|
||||||
uint16_t reserved1 = {};
|
uint16_t reserved1 = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265WeightTable * pWeightTable = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265WeightTable const * pWeightTable = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct EncodeH265ReferenceListsInfoFlags
|
struct EncodeH265ReferenceListsInfoFlags
|
||||||
@@ -3296,10 +3408,10 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceListsInfoFlags flags = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceListsInfoFlags flags = {};
|
||||||
uint8_t num_ref_idx_l0_active_minus1 = {};
|
uint8_t num_ref_idx_l0_active_minus1 = {};
|
||||||
uint8_t num_ref_idx_l1_active_minus1 = {};
|
uint8_t num_ref_idx_l1_active_minus1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF> RefPicList0 = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF> RefPicList0 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF> RefPicList1 = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF> RefPicList1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF> list_entry_l0 = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF> list_entry_l0 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF> list_entry_l1 = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_NUM_LIST_REF> list_entry_l1 = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct EncodeH265PictureInfoFlags
|
struct EncodeH265PictureInfoFlags
|
||||||
@@ -3393,11 +3505,11 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
public:
|
public:
|
||||||
uint8_t num_long_term_sps = {};
|
uint8_t num_long_term_sps = {};
|
||||||
uint8_t num_long_term_pics = {};
|
uint8_t num_long_term_pics = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS> lt_idx_sps = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_LONG_TERM_REF_PICS_SPS> lt_idx_sps = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_LONG_TERM_PICS> poc_lsb_lt = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_LONG_TERM_PICS> poc_lsb_lt = {};
|
||||||
uint16_t used_by_curr_pic_lt_flag = {};
|
uint16_t used_by_curr_pic_lt_flag = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_DELTA_POC> delta_poc_msb_present_flag = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_DELTA_POC> delta_poc_msb_present_flag = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_DELTA_POC> delta_poc_msb_cycle_lt = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_H265_MAX_DELTA_POC> delta_poc_msb_cycle_lt = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct EncodeH265PictureInfo
|
struct EncodeH265PictureInfo
|
||||||
@@ -3447,10 +3559,10 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint8_t short_term_ref_pic_set_idx = {};
|
uint8_t short_term_ref_pic_set_idx = {};
|
||||||
int32_t PicOrderCntVal = {};
|
int32_t PicOrderCntVal = {};
|
||||||
uint8_t TemporalId = {};
|
uint8_t TemporalId = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 7> reserved1 = {};
|
ArrayWrapper1D<uint8_t, 7> reserved1 = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceListsInfo * pRefLists = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265ReferenceListsInfo const * pRefLists = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ShortTermRefPicSet * pShortTermRefPicSet = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::H265ShortTermRefPicSet const * pShortTermRefPicSet = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265LongTermRefPics * pLongTermRefPics = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeH265LongTermRefPics const * pLongTermRefPics = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct EncodeH265ReferenceInfoFlags
|
struct EncodeH265ReferenceInfoFlags
|
||||||
@@ -3704,9 +3816,9 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint8_t loop_filter_level = {};
|
uint8_t loop_filter_level = {};
|
||||||
uint8_t loop_filter_sharpness = {};
|
uint8_t loop_filter_sharpness = {};
|
||||||
uint8_t update_ref_delta = {};
|
uint8_t update_ref_delta = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_VP9_MAX_REF_FRAMES> loop_filter_ref_deltas = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_VP9_MAX_REF_FRAMES> loop_filter_ref_deltas = {};
|
||||||
uint8_t update_mode_delta = {};
|
uint8_t update_mode_delta = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_VP9_LOOP_FILTER_ADJUSTMENTS> loop_filter_mode_deltas = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_VP9_LOOP_FILTER_ADJUSTMENTS> loop_filter_mode_deltas = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct VP9SegmentationFlags
|
struct VP9SegmentationFlags
|
||||||
@@ -3790,10 +3902,10 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9SegmentationFlags flags = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9SegmentationFlags flags = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_VP9_MAX_SEGMENTATION_TREE_PROBS> segmentation_tree_probs = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_VP9_MAX_SEGMENTATION_TREE_PROBS> segmentation_tree_probs = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_VP9_MAX_SEGMENTATION_PRED_PROB> segmentation_pred_prob = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_VP9_MAX_SEGMENTATION_PRED_PROB> segmentation_pred_prob = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_VP9_MAX_SEGMENTS> FeatureEnabled = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_VP9_MAX_SEGMENTS> FeatureEnabled = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int16_t, STD_VIDEO_VP9_MAX_SEGMENTS, STD_VIDEO_VP9_SEG_LVL_MAX> FeatureData = {};
|
ArrayWrapper2D<int16_t, STD_VIDEO_VP9_MAX_SEGMENTS, STD_VIDEO_VP9_SEG_LVL_MAX> FeatureData = {};
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -3905,10 +4017,10 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
int8_t delta_q_uv_ac = {};
|
int8_t delta_q_uv_ac = {};
|
||||||
uint8_t tile_cols_log2 = {};
|
uint8_t tile_cols_log2 = {};
|
||||||
uint8_t tile_rows_log2 = {};
|
uint8_t tile_rows_log2 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, 3> reserved1 = {};
|
ArrayWrapper1D<uint16_t, 3> reserved1 = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ColorConfig * pColorConfig = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9ColorConfig const * pColorConfig = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9LoopFilter * pLoopFilter = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9LoopFilter const * pLoopFilter = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9Segmentation * pSegmentation = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::VP9Segmentation const * pSegmentation = {};
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -4170,12 +4282,12 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilterFlags flags = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilterFlags flags = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS> loop_filter_level = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS> loop_filter_level = {};
|
||||||
uint8_t loop_filter_sharpness = {};
|
uint8_t loop_filter_sharpness = {};
|
||||||
uint8_t update_ref_delta = {};
|
uint8_t update_ref_delta = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME> loop_filter_ref_deltas = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME> loop_filter_ref_deltas = {};
|
||||||
uint8_t update_mode_delta = {};
|
uint8_t update_mode_delta = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS> loop_filter_mode_deltas = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS> loop_filter_mode_deltas = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct AV1QuantizationFlags
|
struct AV1QuantizationFlags
|
||||||
@@ -4302,8 +4414,8 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_SEGMENTS> FeatureEnabled = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_SEGMENTS> FeatureEnabled = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int16_t, STD_VIDEO_AV1_MAX_SEGMENTS, STD_VIDEO_AV1_SEG_LVL_MAX> FeatureData = {};
|
ArrayWrapper2D<int16_t, STD_VIDEO_AV1_MAX_SEGMENTS, STD_VIDEO_AV1_SEG_LVL_MAX> FeatureData = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct AV1TileInfoFlags
|
struct AV1TileInfoFlags
|
||||||
@@ -4388,11 +4500,11 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint8_t TileRows = {};
|
uint8_t TileRows = {};
|
||||||
uint16_t context_update_tile_id = {};
|
uint16_t context_update_tile_id = {};
|
||||||
uint8_t tile_size_bytes_minus_1 = {};
|
uint8_t tile_size_bytes_minus_1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 7> reserved1 = {};
|
ArrayWrapper1D<uint8_t, 7> reserved1 = {};
|
||||||
const uint16_t * pMiColStarts = {};
|
uint16_t const * pMiColStarts = {};
|
||||||
const uint16_t * pMiRowStarts = {};
|
uint16_t const * pMiRowStarts = {};
|
||||||
const uint16_t * pWidthInSbsMinus1 = {};
|
uint16_t const * pWidthInSbsMinus1 = {};
|
||||||
const uint16_t * pHeightInSbsMinus1 = {};
|
uint16_t const * pHeightInSbsMinus1 = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct AV1CDEF
|
struct AV1CDEF
|
||||||
@@ -4434,10 +4546,10 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
public:
|
public:
|
||||||
uint8_t cdef_damping_minus_3 = {};
|
uint8_t cdef_damping_minus_3 = {};
|
||||||
uint8_t cdef_bits = {};
|
uint8_t cdef_bits = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_y_pri_strength = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_y_pri_strength = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_y_sec_strength = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_y_sec_strength = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_uv_pri_strength = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_uv_pri_strength = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_uv_sec_strength = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS> cdef_uv_sec_strength = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct AV1LoopRestoration
|
struct AV1LoopRestoration
|
||||||
@@ -4475,8 +4587,8 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<StdVideoAV1FrameRestorationType, STD_VIDEO_AV1_MAX_NUM_PLANES> FrameRestorationType = {};
|
ArrayWrapper1D<StdVideoAV1FrameRestorationType, STD_VIDEO_AV1_MAX_NUM_PLANES> FrameRestorationType = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint16_t, STD_VIDEO_AV1_MAX_NUM_PLANES> LoopRestorationSize = {};
|
ArrayWrapper1D<uint16_t, STD_VIDEO_AV1_MAX_NUM_PLANES> LoopRestorationSize = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct AV1GlobalMotion
|
struct AV1GlobalMotion
|
||||||
@@ -4514,8 +4626,8 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES> GmType = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES> GmType = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper2D<int32_t, STD_VIDEO_AV1_NUM_REF_FRAMES, STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS> gm_params = {};
|
ArrayWrapper2D<int32_t, STD_VIDEO_AV1_NUM_REF_FRAMES, STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS> gm_params = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct AV1FilmGrainFlags
|
struct AV1FilmGrainFlags
|
||||||
@@ -4612,17 +4724,17 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint16_t grain_seed = {};
|
uint16_t grain_seed = {};
|
||||||
uint8_t film_grain_params_ref_idx = {};
|
uint8_t film_grain_params_ref_idx = {};
|
||||||
uint8_t num_y_points = {};
|
uint8_t num_y_points = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_Y_POINTS> point_y_value = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_Y_POINTS> point_y_value = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_Y_POINTS> point_y_scaling = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_Y_POINTS> point_y_scaling = {};
|
||||||
uint8_t num_cb_points = {};
|
uint8_t num_cb_points = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CB_POINTS> point_cb_value = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CB_POINTS> point_cb_value = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CB_POINTS> point_cb_scaling = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CB_POINTS> point_cb_scaling = {};
|
||||||
uint8_t num_cr_points = {};
|
uint8_t num_cr_points = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CR_POINTS> point_cr_value = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CR_POINTS> point_cr_value = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CR_POINTS> point_cr_scaling = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_MAX_NUM_CR_POINTS> point_cr_scaling = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_LUMA> ar_coeffs_y_plus_128 = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_LUMA> ar_coeffs_y_plus_128 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_CHROMA> ar_coeffs_cb_plus_128 = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_CHROMA> ar_coeffs_cb_plus_128 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_CHROMA> ar_coeffs_cr_plus_128 = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_AV1_MAX_NUM_POS_CHROMA> ar_coeffs_cr_plus_128 = {};
|
||||||
uint8_t cb_mult = {};
|
uint8_t cb_mult = {};
|
||||||
uint8_t cb_luma_mult = {};
|
uint8_t cb_luma_mult = {};
|
||||||
uint16_t cb_offset = {};
|
uint16_t cb_offset = {};
|
||||||
@@ -4748,9 +4860,9 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint8_t order_hint_bits_minus_1 = {};
|
uint8_t order_hint_bits_minus_1 = {};
|
||||||
uint8_t seq_force_integer_mv = {};
|
uint8_t seq_force_integer_mv = {};
|
||||||
uint8_t seq_force_screen_content_tools = {};
|
uint8_t seq_force_screen_content_tools = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 5> reserved1 = {};
|
ArrayWrapper1D<uint8_t, 5> reserved1 = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ColorConfig * pColorConfig = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1ColorConfig const * pColorConfig = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TimingInfo * pTimingInfo = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TimingInfo const * pTimingInfo = {};
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -4890,19 +5002,19 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode TxMode = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode::eOnly4X4;
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode TxMode = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode::eOnly4X4;
|
||||||
uint8_t delta_q_res = {};
|
uint8_t delta_q_res = {};
|
||||||
uint8_t delta_lf_res = {};
|
uint8_t delta_lf_res = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_SKIP_MODE_FRAMES> SkipModeFrame = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_SKIP_MODE_FRAMES> SkipModeFrame = {};
|
||||||
uint8_t coded_denom = {};
|
uint8_t coded_denom = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 3> reserved2 = {};
|
ArrayWrapper1D<uint8_t, 3> reserved2 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES> OrderHints = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES> OrderHints = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_AV1_NUM_REF_FRAMES> expectedFrameId = {};
|
ArrayWrapper1D<uint32_t, STD_VIDEO_AV1_NUM_REF_FRAMES> expectedFrameId = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfo * pTileInfo = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfo const * pTileInfo = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Quantization * pQuantization = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Quantization const * pQuantization = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Segmentation * pSegmentation = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Segmentation const * pSegmentation = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilter * pLoopFilter = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilter const * pLoopFilter = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1CDEF * pCDEF = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1CDEF const * pCDEF = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopRestoration * pLoopRestoration = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopRestoration const * pLoopRestoration = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1GlobalMotion * pGlobalMotion = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1GlobalMotion const * pGlobalMotion = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FilmGrain * pFilmGrain = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FilmGrain const * pFilmGrain = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct DecodeAV1ReferenceInfoFlags
|
struct DecodeAV1ReferenceInfoFlags
|
||||||
@@ -4986,7 +5098,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint8_t frame_type = {};
|
uint8_t frame_type = {};
|
||||||
uint8_t RefFrameSignBias = {};
|
uint8_t RefFrameSignBias = {};
|
||||||
uint8_t OrderHint = {};
|
uint8_t OrderHint = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES> SavedOrderHints = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES> SavedOrderHints = {};
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -5304,19 +5416,19 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode TxMode = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode::eOnly4X4;
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode TxMode = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TxMode::eOnly4X4;
|
||||||
uint8_t delta_q_res = {};
|
uint8_t delta_q_res = {};
|
||||||
uint8_t delta_lf_res = {};
|
uint8_t delta_lf_res = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES> ref_order_hint = {};
|
ArrayWrapper1D<uint8_t, STD_VIDEO_AV1_NUM_REF_FRAMES> ref_order_hint = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<int8_t, STD_VIDEO_AV1_REFS_PER_FRAME> ref_frame_idx = {};
|
ArrayWrapper1D<int8_t, STD_VIDEO_AV1_REFS_PER_FRAME> ref_frame_idx = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 3> reserved1 = {};
|
ArrayWrapper1D<uint8_t, 3> reserved1 = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint32_t, STD_VIDEO_AV1_REFS_PER_FRAME> delta_frame_id_minus_1 = {};
|
ArrayWrapper1D<uint32_t, STD_VIDEO_AV1_REFS_PER_FRAME> delta_frame_id_minus_1 = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfo * pTileInfo = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1TileInfo const * pTileInfo = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Quantization * pQuantization = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Quantization const * pQuantization = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Segmentation * pSegmentation = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1Segmentation const * pSegmentation = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilter * pLoopFilter = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopFilter const * pLoopFilter = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1CDEF * pCDEF = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1CDEF const * pCDEF = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopRestoration * pLoopRestoration = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1LoopRestoration const * pLoopRestoration = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1GlobalMotion * pGlobalMotion = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1GlobalMotion const * pGlobalMotion = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ExtensionHeader * pExtensionHeader = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ExtensionHeader const * pExtensionHeader = {};
|
||||||
const uint32_t * pBufferRemovalTimes = {};
|
uint32_t const * pBufferRemovalTimes = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct EncodeAV1ReferenceInfoFlags
|
struct EncodeAV1ReferenceInfoFlags
|
||||||
@@ -5400,11 +5512,16 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
uint32_t RefFrameId = {};
|
uint32_t RefFrameId = {};
|
||||||
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameType frame_type = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameType::eKey;
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameType frame_type = VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::AV1FrameType::eKey;
|
||||||
uint8_t OrderHint = {};
|
uint8_t OrderHint = {};
|
||||||
VULKAN_HPP_NAMESPACE::ArrayWrapper1D<uint8_t, 3> reserved1 = {};
|
ArrayWrapper1D<uint8_t, 3> reserved1 = {};
|
||||||
const VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ExtensionHeader * pExtensionHeader = {};
|
VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE::EncodeAV1ExtensionHeader const * pExtensionHeader = {};
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
} // namespace VULKAN_HPP_VIDEO_NAMESPACE
|
} // namespace VULKAN_HPP_VIDEO_NAMESPACE
|
||||||
} // namespace VULKAN_HPP_NAMESPACE
|
} // namespace VULKAN_HPP_NAMESPACE
|
||||||
|
|
||||||
|
#if defined( has_include_was_not_defined )
|
||||||
|
# undef has_include_was_not_defined
|
||||||
|
# undef __has_include
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_WAYLAND_H_ 1
|
#define VULKAN_WAYLAND_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_WIN32_H_ 1
|
#define VULKAN_WIN32_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_XCB_H_ 1
|
#define VULKAN_XCB_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_XLIB_H_ 1
|
#define VULKAN_XLIB_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
#define VULKAN_XLIB_XRANDR_H_ 1
|
#define VULKAN_XLIB_XRANDR_H_ 1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Copyright 2015-2025 The Khronos Group Inc.
|
** Copyright 2015-2026 The Khronos Group Inc.
|
||||||
**
|
**
|
||||||
** SPDX-License-Identifier: Apache-2.0
|
** SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -11,17 +11,6 @@ set_targetdir("./")
|
|||||||
set_optimize("fastest")
|
set_optimize("fastest")
|
||||||
|
|
||||||
-- Options
|
-- Options
|
||||||
|
|
||||||
option("images_optimized")
|
|
||||||
set_default(true)
|
|
||||||
add_defines("IMAGE_OPTIMIZED")
|
|
||||||
option_end()
|
|
||||||
|
|
||||||
option("force_integrated_gpu")
|
|
||||||
set_default(false)
|
|
||||||
add_defines("FORCE_INTEGRATED_GPU")
|
|
||||||
option_end()
|
|
||||||
|
|
||||||
option("graphics_memory_dump")
|
option("graphics_memory_dump")
|
||||||
set_default(false)
|
set_default(false)
|
||||||
add_defines("GRAPHICS_MEMORY_DUMP")
|
add_defines("GRAPHICS_MEMORY_DUMP")
|
||||||
@@ -48,8 +37,6 @@ target("mlx")
|
|||||||
set_default(true)
|
set_default(true)
|
||||||
set_license("MIT")
|
set_license("MIT")
|
||||||
set_kind("shared")
|
set_kind("shared")
|
||||||
add_options("images_optimized")
|
|
||||||
add_options("force_integrated_gpu")
|
|
||||||
add_options("graphics_memory_dump")
|
add_options("graphics_memory_dump")
|
||||||
add_options("profiler")
|
add_options("profiler")
|
||||||
add_options("force_wayland")
|
add_options("force_wayland")
|
||||||
|
|||||||
Reference in New Issue
Block a user