Add support for specifying colorspace for Camera render

Merge branch 'develop' into camera-items
fix: cargo.lock
2023-10-14 12:28:27 -04:00 · 2023-10-11 00:22:48 -04:00 · 2023-10-06 11:59:13 -04:00 · 2023-10-06 11:59:13 -04:00 · 2023-10-06 11:59:13 -04:00 · 2023-10-06 11:59:13 -04:00
7 changed files with 442 additions and 286 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"

 [[package]]
 name = "aho-corasick"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
 "memchr",
 ]
@@ -55,9 +55,9 @@ dependencies = [

 [[package]]
 name = "anstream"
-version = "0.5.0"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
+checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@@ -69,15 +69,15 @@ dependencies = [

 [[package]]
 name = "anstyle"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"

 [[package]]
 name = "anstyle-parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
 dependencies = [
 "utf8parse",
 ]
@@ -93,9 +93,9 @@ dependencies = [

 [[package]]
 name = "anstyle-wincon"
-version = "2.1.0"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
+checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
 dependencies = [
 "anstyle",
 "windows-sys",
@@ -139,7 +139,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -282,14 +282,14 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]

 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"

 [[package]]
 name = "bytes"
@@ -299,9 +299,9 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"

 [[package]]
 name = "calloop"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aadd183e815348c0649051b1c43418643208f8ed13c8a84da7215b4e1cf42714"
+checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf"
 dependencies = [
 "bitflags 2.4.0",
 "log",
@@ -358,9 +358,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.4.5"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3"
+checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -368,9 +368,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.4.5"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab"
+checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
 dependencies = [
 "anstream",
 "anstyle",
@@ -387,7 +387,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -454,7 +454,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d"
 dependencies = [
 "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -540,6 +540,12 @@ dependencies = [
 "windows-sys",
 ]

+[[package]]
+name = "cursor-icon"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "740bb192a8e2d1350119916954f4409ee7f62f149b536911eeb78ba5a20526bf"
+
 [[package]]
 name = "directories"
 version = "5.0.1"
@@ -576,7 +582,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.8.0",
+ "libloading 0.8.1",
 ]

 [[package]]
@@ -613,6 +619,9 @@ name = "drm-fourcc"
 version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
+dependencies = [
+ "serde",
+]

 [[package]]
 name = "drm-sys"
@@ -627,69 +636,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"

 [[package]]
-name = "encoding"
-version = "0.2.33"
+name = "encoding_rs"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
 dependencies = [
- "encoding-index-japanese",
- "encoding-index-korean",
- "encoding-index-simpchinese",
- "encoding-index-singlebyte",
- "encoding-index-tradchinese",
+ "cfg-if",
 ]

-[[package]]
-name = "encoding-index-japanese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-korean"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-simpchinese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-singlebyte"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-tradchinese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding_index_tests"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
-
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -698,25 +652,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"

 [[package]]
 name = "errno"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
+checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
 dependencies = [
- "errno-dragonfly",
 "libc",
 "windows-sys",
 ]

-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "eyre"
 version = "0.6.8"
@@ -745,9 +688,9 @@ dependencies = [

 [[package]]
 name = "flate2"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
 dependencies = [
 "crc32fast",
 "miniz_oxide",
@@ -952,9 +895,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"

 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"

 [[package]]
 name = "hdrhistogram"
@@ -1093,12 +1036,12 @@ dependencies = [

 [[package]]
 name = "indexmap"
-version = "2.0.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
 dependencies = [
 "equivalent",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
 ]

 [[package]]
@@ -1166,9 +1109,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"

 [[package]]
 name = "libc"
-version = "0.2.148"
+version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"

 [[package]]
 name = "libloading"
@@ -1182,9 +1125,9 @@ dependencies = [

 [[package]]
 name = "libloading"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb"
+checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
 dependencies = [
 "cfg-if",
 "windows-sys",
@@ -1192,9 +1135,9 @@ dependencies = [

 [[package]]
 name = "linux-raw-sys"
-version = "0.4.7"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"

 [[package]]
 name = "lock_api"
@@ -1234,7 +1177,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -1254,9 +1197,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"

 [[package]]
 name = "memchr"
-version = "2.6.3"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"

 [[package]]
 name = "memmap2"
@@ -1388,9 +1331,9 @@ dependencies = [

 [[package]]
 name = "num-traits"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
 "autocfg",
 ]
@@ -1444,7 +1387,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -1490,7 +1433,7 @@ dependencies = [
 "proc-macro-error",
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -1582,7 +1525,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -1605,9 +1548,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"

 [[package]]
 name = "polling"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7571075a670bb8e02350c4d1c27d934aabdce416aa91a95d58dc9e21267dad3c"
+checksum = "62a79e457c9898100b4298d57d69ec53d06f9a6ed352431ce5f377e082d2e846"
 dependencies = [
 "cfg-if",
 "concurrent-queue",
@@ -1676,9 +1619,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
 "unicode-ident",
 ]
@@ -1699,7 +1642,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb156a45b6b9fe8027497422179fb65afc84d36707a7ca98297bf06bccb8d43f"
 dependencies = [
 "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -1813,14 +1756,14 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.9.5"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
+checksum = "aaac441002f822bc9705a681810a4dd2963094b9ca0ddc41cb963a4c189189ea"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-automata 0.3.8",
- "regex-syntax 0.7.5",
+ "regex-automata 0.4.2",
+ "regex-syntax 0.8.2",
 ]

 [[package]]
@@ -1834,13 +1777,13 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.3.8"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
+checksum = "5011c7e263a695dc8ca064cddb722af1be54e517a280b12a5356f98366899e5d"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-syntax 0.7.5",
+ "regex-syntax 0.8.2",
 ]

 [[package]]
@@ -1851,9 +1794,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"

 [[package]]
 name = "regex-syntax"
-version = "0.7.5"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"

 [[package]]
 name = "rustc-demangle"
@@ -1878,9 +1821,9 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "0.38.14"
+version = "0.38.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f"
+checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed"
 dependencies = [
 "bitflags 2.4.0",
 "errno",
@@ -1921,9 +1864,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"

 [[package]]
 name = "semver"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"

 [[package]]
 name = "send_wrapper"
@@ -1933,22 +1876,22 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"

 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -1970,14 +1913,14 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]

 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
 "lazy_static",
 ]
@@ -2015,22 +1958,23 @@ checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 [[package]]
 name = "smithay"
 version = "0.3.0"
-source = "git+https://github.com/smithay/smithay.git#298a3ec08bf6ea6da8dc6e1e4c6d29d821fc040f"
+source = "git+https://github.com/smithay/smithay.git#4e41ab0694c1c43324cc217dcf2a203cd240c0dc"
 dependencies = [
 "appendlist",
 "bitflags 2.4.0",
 "calloop",
 "cgmath",
+ "cursor-icon",
 "downcast-rs",
 "drm",
 "drm-ffi",
 "drm-fourcc",
- "encoding",
+ "encoding_rs",
 "gl_generator",
- "indexmap 2.0.0",
+ "indexmap 2.0.2",
 "lazy_static",
 "libc",
- "libloading 0.8.0",
+ "libloading 0.8.1",
 "nix 0.27.1",
 "once_cell",
 "profiling",
@@ -2072,11 +2016,12 @@ dependencies = [
 [[package]]
 name = "stardust-xr"
 version = "0.14.1"
-source = "git+https://github.com/StardustXR/core.git#615d4b098f848b1699ac6763b22d6c8783328f10"
+source = "git+https://github.com/StardustXR/core.git?branch=camera-item#2689f608c1375799f2042d5d8a5f3efa76bf57ec"
 dependencies = [
 "cluFlock",
 "color-rs",
 "dirs",
+ "drm-fourcc",
 "global_counter",
 "mint",
 "nix 0.26.4",
@@ -2092,7 +2037,7 @@ dependencies = [
 [[package]]
 name = "stardust-xr-schemas"
 version = "1.5.3"
-source = "git+https://github.com/StardustXR/core.git#615d4b098f848b1699ac6763b22d6c8783328f10"
+source = "git+https://github.com/StardustXR/core.git?branch=camera-item#2689f608c1375799f2042d5d8a5f3efa76bf57ec"
 dependencies = [
 "flatbuffers",
 "flexbuffers",
@@ -2115,6 +2060,7 @@ dependencies = [
 "console-subscriber",
 "ctrlc",
 "directories",
+ "drm-fourcc",
 "glam 0.23.0",
 "global_counter",
 "input-event-codes",
@@ -2194,9 +2140,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.37"
+version = "2.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2224,22 +2170,22 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.48"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
+checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.48"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
+checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -2254,9 +2200,9 @@ dependencies = [

 [[package]]
 name = "tokio"
-version = "1.32.0"
+version = "1.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
 dependencies = [
 "backtrace",
 "bytes",
@@ -2290,7 +2236,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -2330,7 +2276,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.0.0",
+ "indexmap 2.0.2",
 "toml_datetime",
 "winnow",
 ]
@@ -2397,11 +2343,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"

 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9"
 dependencies = [
- "cfg-if",
 "pin-project-lite",
 "tracing-attributes",
 "tracing-core",
@@ -2409,20 +2354,20 @@ dependencies = [

 [[package]]
 name = "tracing-attributes"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]

 [[package]]
 name = "tracing-core"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
 "once_cell",
 "valuable",
@@ -2741,9 +2686,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"

 [[package]]
 name = "winnow"
-version = "0.5.15"
+version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
 dependencies = [
 "memchr",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -62,6 +62,7 @@ xkbcommon = { version = "0.6.0", default-features = false, optional = true }
 ctrlc = "3.4.1"
 libc = "0.2.148"
 input-event-codes = "5.16.8"
+drm-fourcc = { version = "2.2.0", features = ["serde"] }

 [dependencies.smithay]
 # git = "https://github.com/technobaboo/smithay.git" # Until we get stereokit to understand OES samplers and external textures
@@ -93,6 +94,7 @@ optional = true

 [dependencies.stardust-xr]
 git = "https://github.com/StardustXR/core.git"
+branch = "camera-item"

 # [patch.crates-io.stereokit]
 # path = "../stereokit-rs"
--- a/src/core/buffers.rs
+++ b/src/core/buffers.rs
@@ -0,0 +1,50 @@
+use std::ffi::c_void;
+
+use color_eyre::eyre::{ensure, Result};
+use smithay::backend::{egl::EGLContext, renderer::gles::GlesRenderer};
+use stereokit as sk;
+
+struct EGLRawHandles {
+	display: *const c_void,
+	config: *const c_void,
+	context: *const c_void,
+}
+fn get_sk_egl() -> Result<EGLRawHandles> {
+	ensure!(
+		unsafe { sk::sys::backend_graphics_get() }
+			== sk::sys::backend_graphics__backend_graphics_opengles_egl,
+		"StereoKit is not running using EGL!"
+	);
+
+	Ok(unsafe {
+		EGLRawHandles {
+			display: sk::sys::backend_opengl_egl_get_display() as *const c_void,
+			config: sk::sys::backend_opengl_egl_get_config() as *const c_void,
+			context: sk::sys::backend_opengl_egl_get_context() as *const c_void,
+		}
+	})
+}
+
+pub struct BufferManager {
+	pub renderer: GlesRenderer,
+}
+impl BufferManager {
+	pub fn new() -> Result<Self> {
+		let egl_raw_handles = get_sk_egl()?;
+		let renderer = unsafe {
+			GlesRenderer::new(EGLContext::from_raw(
+				egl_raw_handles.display,
+				egl_raw_handles.config,
+				egl_raw_handles.context,
+			)?)?
+		};
+
+		Ok(BufferManager { renderer })
+	}
+
+	pub fn make_context_current(&self) {
+		unsafe {
+			let _ = self.renderer.egl_context().make_current();
+		}
+	}
+}
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -9,3 +9,4 @@ pub mod resource;
 pub mod scenegraph;
 pub mod task;
 pub mod typed_datamap;
+pub mod buffers;
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,7 +6,7 @@ mod wayland;

 use crate::core::client::CLIENTS;
 use crate::core::client_state::ClientState;
-use crate::core::destroy_queue;
+use crate::core::{destroy_queue, buffers};
 use crate::nodes::items::camera;
 use crate::nodes::{audio, drawable, hmd, input};
 use crate::objects::input::eye_pointer::EyePointer;
@@ -199,8 +199,10 @@ fn main() {
 	let event_loop_info = info_receiver.blocking_recv().unwrap();
 	let _tokio_handle = event_loop_info.tokio_handle.enter();

+	let mut buffer_manager = buffers::BufferManager::new().expect("Could not initialize buffer manager");
+
 	#[cfg(feature = "wayland")]
-	let mut wayland = wayland::Wayland::new().expect("Could not initialize wayland");
+	let mut wayland = wayland::Wayland::new(&buffer_manager).expect("Could not initialize wayland");
 	info!("Stardust ready!");

 	let mut startup_child = (|| {
@@ -260,8 +262,8 @@ fn main() {
 				let _span = debug_span!("StereoKit step");
 				let _span = _span.enter();

+				camera::send_rendered();
 				hmd::frame(sk);
-				camera::update(sk);
 				#[cfg(feature = "wayland")]
 				wayland.frame_event(sk);
 				destroy_queue::clear();
@@ -293,11 +295,13 @@ fn main() {
 				);

 				#[cfg(feature = "wayland")]
-				wayland.update(sk);
+				wayland.update(sk, &mut buffer_manager);
 				drawable::draw(sk);
 				audio::update(sk);
-				#[cfg(feature = "wayland")]
-				wayland.make_context_current();
+
+				buffer_manager.make_context_current();
+
+				camera::update(sk, &mut buffer_manager);
 			},
 			|_sk| {
 				info!("Cleanly shut down StereoKit");
--- a/src/nodes/items/camera.rs
+++ b/src/nodes/items/camera.rs
@@ -1,6 +1,7 @@
 use super::{Item, ItemType};
 use crate::{
 	core::{
+		buffers::BufferManager,
 		client::{Client, INTERNAL_CLIENT},
 		registry::Registry,
 		scenegraph::MethodResponseSender,
@@ -12,7 +13,7 @@ use crate::{
 		Message, Node,
 	},
 };
-use color_eyre::eyre::{bail, eyre, Result};
+use color_eyre::eyre::{bail, Result};
 use glam::Mat4;
 use lazy_static::lazy_static;
 use mint::{RowMatrix4, Vector2};
@@ -20,20 +21,30 @@ use nanoid::nanoid;
 use once_cell::sync::OnceCell;
 use parking_lot::Mutex;
 use serde::Deserialize;
+use smithay::backend::{
+	allocator::{
+		dmabuf::{Dmabuf, DmabufFlags},
+		Buffer,
+	},
+	renderer::{gles, ImportDma},
+};
 use stardust_xr::{
+	scenegraph::ScenegraphError,
 	schemas::flex::{deserialize, serialize},
-	values::Transform,
+	values::{BufferColorspace, BufferInfo, Transform},
 };
-use std::sync::Arc;
+use std::{ffi::c_void, sync::Arc};
 use stereokit::{
-	Color128, Material, Rect, RenderLayer, StereoKitDraw, Tex, TextureType, Transparency,
+	Color128, Material, Rect, RenderLayer, StereoKitDraw, Tex, TextureFormat, TextureType,
+	Transparency,
 };
+use tokio::sync::mpsc::{self, error::SendError};

 lazy_static! {
 	pub(super) static ref ITEM_TYPE_INFO_CAMERA: TypeInfo = TypeInfo {
 		type_name: "camera",
-		aliased_local_signals: vec!["apply_preview_material", "frame"],
-		aliased_local_methods: vec![],
+		aliased_local_signals: vec!["apply_preview_material"],
+		aliased_local_methods: vec!["render"],
 		aliased_remote_signals: vec![],
 		ui: Default::default(),
 		items: Registry::new(),
@@ -43,7 +54,7 @@ lazy_static! {

 struct FrameInfo {
 	proj_matrix: Mat4,
-	px_size: Vector2<u32>,
+	preview_size: Vector2<u32>,
 }

 pub struct CameraItem {
@@ -51,46 +62,96 @@ pub struct CameraItem {
 	frame_info: Mutex<FrameInfo>,
 	sk_tex: OnceCell<Tex>,
 	sk_mat: OnceCell<Arc<Material>>,
-	applied_to: Registry<ModelPart>,
-	apply_to: Registry<ModelPart>,
+	render_requests_tx: mpsc::UnboundedSender<(Dmabuf, BufferColorspace, MethodResponseSender)>,
+	render_requests_rx:
+		Mutex<mpsc::UnboundedReceiver<(Dmabuf, BufferColorspace, MethodResponseSender)>>,
+	rendered_notifiers: Mutex<Vec<MethodResponseSender>>,
+	applied_preview_to: Registry<ModelPart>,
+	apply_preview_to: Registry<ModelPart>,
 }
 impl CameraItem {
-	pub fn add_to(node: &Arc<Node>, proj_matrix: Mat4, px_size: Vector2<u32>) {
+	pub fn add_to(node: &Arc<Node>, proj_matrix: Mat4, preview_size: Vector2<u32>) {
+		let (render_requests_tx, render_requests_rx) = mpsc::unbounded_channel();
+		let camera_specialization = CameraItem {
+			space: node.spatial.get().unwrap().clone(),
+			frame_info: Mutex::new(FrameInfo {
+				proj_matrix,
+				preview_size,
+			}),
+			sk_tex: OnceCell::new(),
+			sk_mat: OnceCell::new(),
+			render_requests_tx,
+			render_requests_rx: Mutex::new(render_requests_rx),
+			rendered_notifiers: Mutex::new(Vec::new()),
+			applied_preview_to: Registry::new(),
+			apply_preview_to: Registry::new(),
+		};
 		Item::add_to(
 			node,
 			nanoid!(),
 			&ITEM_TYPE_INFO_CAMERA,
-			ItemType::Camera(CameraItem {
-				space: node.spatial.get().unwrap().clone(),
-				frame_info: Mutex::new(FrameInfo {
-					proj_matrix,
-					px_size,
-				}),
-				sk_tex: OnceCell::new(),
-				sk_mat: OnceCell::new(),
-				applied_to: Registry::new(),
-				apply_to: Registry::new(),
-			}),
+			ItemType::Camera(camera_specialization),
 		);
-		node.add_local_method("frame", CameraItem::frame_flex);
+		node.add_local_method("render", CameraItem::render_flex);
 		node.add_local_signal(
 			"apply_preview_material",
 			CameraItem::apply_preview_material_flex,
 		);
 	}

-	fn frame_flex(
+	fn render_flex(
 		node: &Node,
 		_calling_client: Arc<Client>,
-		_message: Message,
+		message: Message,
 		response: MethodResponseSender,
 	) {
-		response.wrap_sync(move || {
-			let ItemType::Camera(_camera) = &node.item.get().unwrap().specialization else {
-				return Err(eyre!("Wrong item type?"))
-			};
-			Ok(serialize(())?.into())
-		});
+		let Some(item) = node.item.get() else {
+			let _ = response.send(Err(ScenegraphError::MethodError {
+				error: "Item not found".to_string(),
+			}));
+			return;
+		};
+		let ItemType::Camera(camera) = &item.specialization else {
+			let _ = response.send(Err(ScenegraphError::MethodError {
+				error: "Wrong item type?".to_string(),
+			}));
+			return;
+		};
+
+		let buffer_info: BufferInfo = match deserialize(&message.data) {
+			Ok(i) => i,
+			Err(e) => {
+				let _ = response.send(Err(ScenegraphError::MethodError {
+					error: e.to_string(),
+				}));
+				return;
+			}
+		};
+		let mut builder = Dmabuf::builder(
+			(buffer_info.width as i32, buffer_info.height as i32),
+			buffer_info.fourcc.try_into().unwrap(),
+			DmabufFlags::from_bits_truncate(buffer_info.flags),
+		);
+		for (fd, plane) in message.fds.into_iter().zip(buffer_info.planes) {
+			builder.add_plane(
+				fd,
+				plane.idx,
+				plane.offset,
+				plane.stride,
+				plane.modifier.try_into().unwrap(),
+			);
+		}
+		let buffer_to_render = builder.build().unwrap();
+
+		if let Err(SendError((_dmabuf, _colorspace, sender))) =
+			camera
+				.render_requests_tx
+				.send((buffer_to_render, buffer_info.colorspace, response))
+		{
+			sender.send(Err(ScenegraphError::MethodError {
+				error: "Internal: sender broke????".to_string(),
+			}));
+		}
 	}

 	fn apply_preview_material_flex(
@@ -98,14 +159,24 @@ impl CameraItem {
 		calling_client: Arc<Client>,
 		message: Message,
 	) -> Result<()> {
-		let ItemType::Camera(camera) = &node.item.get().unwrap().specialization else {
+		let Some(item) = node.item.get() else {
+			bail!("Item not found?")
+		};
+		let ItemType::Camera(camera) = &item.specialization else {
 			bail!("Wrong item type?")
 		};
-		let model_part_node =
-			calling_client.get_node("Model part", deserialize(&message.data).unwrap())?;
-		let Drawable::ModelPart(model_part) = model_part_node.get_aspect("Model part", "model part", |n| &n.drawable)? else {bail!("Drawable is not a model node")};
-		camera.applied_to.add_raw(model_part);
-		camera.apply_to.add_raw(model_part);
+
+		let model_part_path = deserialize(&message.data)?;
+		let model_part_node = calling_client.get_node("Model part", model_part_path)?;
+		let Drawable::ModelPart(model_part) =
+			model_part_node.get_aspect("Model part", "model part", |n| &n.drawable)?
+		else {
+			bail!("Drawable is not a model node")
+		};
+
+		camera.applied_preview_to.add_raw(model_part);
+		camera.apply_preview_to.add_raw(model_part);
+
 		Ok(())
 	}

@@ -113,33 +184,40 @@ impl CameraItem {
 		Ok(serialize(id)?.into())
 	}

-	pub fn update(&self, sk: &impl StereoKitDraw) {
+	pub fn update(&self, sk: &impl StereoKitDraw, buffer_manager: &mut BufferManager) {
 		let frame_info = self.frame_info.lock();
-		let sk_tex = self.sk_tex.get_or_init(|| {
-			sk.tex_gen_color(
-				Color128::default(),
-				frame_info.px_size.x as i32,
-				frame_info.px_size.y as i32,
-				TextureType::RENDER_TARGET,
-				stereokit::TextureFormat::RGBA32Linear,
-			)
-		});
-		let sk_mat = self.sk_mat.get_or_init(|| {
-			let shader = sk.shader_create_mem(&UNLIT_SHADER_BYTES).unwrap();
-			let mat = sk.material_create(&shader);
-			sk.material_set_texture(&mat, "diffuse", sk_tex.as_ref());
-			sk.material_set_transparency(&mat, Transparency::Blend);
-			Arc::new(mat)
-		});
-		for model_part in self.apply_to.take_valid_contents() {
-			model_part.replace_material(sk_mat.clone())
+		self.render_preview(sk, &*frame_info);
+		self.render_dmabuf(sk, buffer_manager, &*frame_info);
+	}
+
+	fn render_preview(&self, sk: &impl StereoKitDraw, frame_info: &FrameInfo) {
+		if !self.apply_preview_to.is_empty() {
+			let sk_tex = self.sk_tex.get_or_init(|| {
+				sk.tex_gen_color(
+					Color128::default(),
+					frame_info.preview_size.x as i32,
+					frame_info.preview_size.y as i32,
+					TextureType::RENDER_TARGET,
+					TextureFormat::RGBA32Linear,
+				)
+			});
+			let sk_mat = self.sk_mat.get_or_init(|| {
+				let shader = sk.shader_create_mem(&UNLIT_SHADER_BYTES).unwrap();
+				let mat = sk.material_create(&shader);
+				sk.material_set_texture(&mat, "diffuse", sk_tex.as_ref());
+				sk.material_set_transparency(&mat, Transparency::Blend);
+				Arc::new(mat)
+			});
+			for model_part in self.apply_preview_to.take_valid_contents() {
+				model_part.replace_material(sk_mat.clone())
+			}
 		}

-		if !self.applied_to.is_empty() {
+		if !self.applied_preview_to.is_empty() {
 			sk.render_to(
-				sk_tex,
-				frame_info.proj_matrix,
+				self.sk_tex.get().unwrap(),
 				self.space.global_transform(),
+				frame_info.proj_matrix,
 				RenderLayer::all(),
 				stereokit::RenderClear::All,
 				Rect {
@@ -151,12 +229,123 @@ impl CameraItem {
 			);
 		}
 	}
+
+	fn render_dmabuf(
+		&self,
+		sk: &impl StereoKitDraw,
+		buffer_manager: &mut BufferManager,
+		frame_info: &FrameInfo,
+	) {
+		let mut render_notifiers = self.rendered_notifiers.lock();
+		let mut render_requests_rx = self.render_requests_rx.lock();
+		while let Ok((buffer_to_render, colorspace, render_response_sender)) =
+			render_requests_rx.try_recv()
+		{
+			let imported_dmabuf = buffer_manager
+				.renderer
+				.import_dmabuf(&buffer_to_render, None);
+			let smithay_tex = match imported_dmabuf {
+				Ok(t) => t,
+				Err(e) => {
+					let _ = render_response_sender.send(Err(ScenegraphError::MethodError {
+						error: e.to_string(),
+					}));
+					continue;
+				}
+			};
+
+			let texture_format;
+			let native_format;
+
+			match colorspace {
+				BufferColorspace::SRGB => match buffer_to_render.format().code {
+					drm_fourcc::DrmFourcc::Argb8888 => {
+						texture_format = TextureFormat::RGBA32;
+						native_format = gles::ffi::SRGB8_ALPHA8;
+					}
+					drm_fourcc::DrmFourcc::Abgr8888 => {
+						texture_format = TextureFormat::BGRA32;
+						native_format = gles::ffi::SRGB8_ALPHA8;
+					}
+					_ => {
+						let _ = render_response_sender.send(Err(ScenegraphError::MethodError {
+							error: "Unsupported pixel format".to_string(),
+						}));
+						continue;
+					}
+				},
+				BufferColorspace::Linear => match buffer_to_render.format().code {
+					drm_fourcc::DrmFourcc::Argb8888 => {
+						texture_format = TextureFormat::RGBA32Linear;
+						native_format = gles::ffi::RGBA8;
+					}
+					drm_fourcc::DrmFourcc::Abgr8888 => {
+						texture_format = TextureFormat::BGRA32Linear;
+						native_format = gles::ffi::RGBA8;
+					}
+					_ => {
+						let _ = render_response_sender.send(Err(ScenegraphError::MethodError {
+							error: "Unsupported pixel format".to_string(),
+						}));
+						continue;
+					}
+				},
+			}
+
+			// TODO: This doesn't seem to care about the texture format, it seems to always output with sRGB.
+			let sk_tex = sk.tex_create(TextureType::IMAGE_NO_MIPS, texture_format);
+			unsafe {
+				sk.tex_set_surface(
+					&sk_tex,
+					smithay_tex.tex_id() as usize as *mut c_void,
+					TextureType::RENDER_TARGET,
+					native_format.into(),
+					buffer_to_render.size().w,
+					buffer_to_render.size().h,
+					1,
+					false,
+				);
+			}
+
+			sk.render_to(
+				sk_tex,
+				self.space.global_transform(),
+				frame_info.proj_matrix,
+				RenderLayer::all(),
+				stereokit::RenderClear::All,
+				Rect {
+					x: 0.0,
+					y: 0.0,
+					w: 0.0,
+					h: 0.0,
+				},
+			);
+			render_notifiers.push(render_response_sender);
+		}
+	}
+
+	pub fn send_rendered(&self) {
+		for notifier in self.rendered_notifiers.lock().drain(..) {
+			let _ = notifier.send(Ok(Vec::new().into()));
+		}
+	}
 }

-pub fn update(sk: &impl StereoKitDraw) {
+pub fn update(sk: &impl StereoKitDraw, buffer_manager: &mut BufferManager) {
 	for camera in ITEM_TYPE_INFO_CAMERA.items.get_valid_contents() {
-		let ItemType::Camera(camera) = &camera.specialization else {continue};
-		camera.update(sk);
+		let ItemType::Camera(camera) = &camera.specialization else {
+			continue;
+		};
+		camera.update(sk, buffer_manager);
+	}
+}
+
+pub fn send_rendered() {
+	for camera in ITEM_TYPE_INFO_CAMERA.items.get_valid_contents() {
+		let ItemType::Camera(camera) = &camera.specialization else {
+			continue;
+		};
+		camera.send_rendered();
 	}
 }

@@ -171,7 +360,7 @@ pub(super) fn create_camera_item_flex(
 		parent_path: &'a str,
 		transform: Transform,
 		proj_matrix: RowMatrix4<f32>,
-		px_size: Vector2<u32>,
+		preview_size: Vector2<u32>,
 	}
 	let info: CreateCameraItemInfo = deserialize(message.as_ref())?;
 	let parent_name = format!("/item/{}/item", ITEM_TYPE_INFO_CAMERA.type_name);
@@ -181,7 +370,8 @@ pub(super) fn create_camera_item_flex(
 	let node =
 		Node::create(&INTERNAL_CLIENT, &parent_name, info.name, false).add_to_scenegraph()?;
 	Spatial::add_to(&node, None, transform * space.global_transform(), false)?;
-	CameraItem::add_to(&node, info.proj_matrix.into(), info.px_size);
+	CameraItem::add_to(&node, info.proj_matrix.into(), info.preview_size);
+	// TODO: this means ANY client can render anywhere with no limits, this needs to be changed!!
 	node.item
 		.get()
 		.unwrap()
--- a/src/wayland/mod.rs
+++ b/src/wayland/mod.rs
@@ -10,16 +10,15 @@ mod xdg_shell;
 pub mod xwayland;

 use self::{state::WaylandState, surface::CORE_SURFACES};
+use crate::core::buffers::BufferManager;
 use crate::wayland::seat::SeatData;
 use crate::{core::task, wayland::state::ClientState};
-use color_eyre::eyre::{ensure, Result};
+use color_eyre::eyre::Result;
 use global_counter::primitive::exact::CounterU32;
 use once_cell::sync::OnceCell;
 use parking_lot::Mutex;
 use sk::StereoKitDraw;
 use smithay::backend::allocator::dmabuf::Dmabuf;
-use smithay::backend::egl::EGLContext;
-use smithay::backend::renderer::gles::GlesRenderer;
 use smithay::backend::renderer::ImportDma;
 use smithay::reexports::wayland_server::backend::ClientId;
 use smithay::reexports::wayland_server::DisplayHandle;
@@ -28,7 +27,6 @@ use std::ffi::OsStr;
 use std::os::fd::OwnedFd;
 use std::os::unix::prelude::AsRawFd;
 use std::{
-	ffi::c_void,
 	os::unix::{net::UnixListener, prelude::FromRawFd},
 	sync::Arc,
 };
@@ -42,27 +40,6 @@ use tracing::{debug_span, info, instrument};
 pub static WAYLAND_DISPLAY: OnceCell<String> = OnceCell::new();
 pub static SERIAL_COUNTER: CounterU32 = CounterU32::new(0);

-struct EGLRawHandles {
-	display: *const c_void,
-	config: *const c_void,
-	context: *const c_void,
-}
-fn get_sk_egl() -> Result<EGLRawHandles> {
-	ensure!(
-		unsafe { sk::sys::backend_graphics_get() }
-			== sk::sys::backend_graphics__backend_graphics_opengles_egl,
-		"StereoKit is not running using EGL!"
-	);
-
-	Ok(unsafe {
-		EGLRawHandles {
-			display: sk::sys::backend_opengl_egl_get_display() as *const c_void,
-			config: sk::sys::backend_opengl_egl_get_config() as *const c_void,
-			context: sk::sys::backend_opengl_egl_get_context() as *const c_void,
-		}
-	})
-}
-
 pub struct DisplayWrapper(Mutex<Display<WaylandState>>, DisplayHandle);
 impl DisplayWrapper {
 	pub fn handle(&self) -> DisplayHandle {
@@ -85,23 +62,13 @@ pub struct Wayland {
 	display: Arc<DisplayWrapper>,
 	pub socket_name: Option<String>,
 	join_handle: JoinHandle<Result<()>>,
-	renderer: GlesRenderer,
 	dmabuf_rx: UnboundedReceiver<Dmabuf>,
 	wayland_state: Arc<Mutex<WaylandState>>,
 	#[cfg(feature = "xwayland")]
 	pub xwayland_state: xwayland::XWaylandState,
 }
 impl Wayland {
-	pub fn new() -> Result<Self> {
-		let egl_raw_handles = get_sk_egl()?;
-		let renderer = unsafe {
-			GlesRenderer::new(EGLContext::from_raw(
-				egl_raw_handles.display,
-				egl_raw_handles.config,
-				egl_raw_handles.context,
-			)?)?
-		};
-
+	pub fn new(buffer_manager: &BufferManager) -> Result<Self> {
 		let display: Display<WaylandState> = Display::new()?;
 		let display_handle = display.handle();

@@ -109,7 +76,7 @@ impl Wayland {
 		let display = Arc::new(DisplayWrapper(Mutex::new(display), display_handle.clone()));
 		#[cfg(feature = "xwayland")]
 		let xwayland_state = xwayland::XWaylandState::create(&display_handle)?;
-		let wayland_state = WaylandState::new(display_handle, &renderer, dmabuf_tx);
+		let wayland_state = WaylandState::new(display_handle, &buffer_manager.renderer, dmabuf_tx);

 		let socket = ListeningSocket::bind_auto("wayland", 0..33)?;
 		let socket_name = socket
@@ -127,7 +94,6 @@ impl Wayland {
 			display,
 			socket_name,
 			join_handle,
-			renderer,
 			dmabuf_rx,
 			wayland_state,
 			#[cfg(feature = "xwayland")]
@@ -178,13 +144,17 @@ impl Wayland {
 		})?)
 	}

-	#[instrument(level = "debug", name = "Wayland frame", skip(self, sk))]
-	pub fn update(&mut self, sk: &impl StereoKitDraw) {
+	#[instrument(
+		level = "debug",
+		name = "Wayland frame",
+		skip(self, sk, buffer_manager)
+	)]
+	pub fn update(&mut self, sk: &impl StereoKitDraw, buffer_manager: &mut BufferManager) {
 		while let Ok(dmabuf) = self.dmabuf_rx.try_recv() {
-			let _ = self.renderer.import_dmabuf(&dmabuf, None);
+			let _ = buffer_manager.renderer.import_dmabuf(&dmabuf, None);
 		}
 		for core_surface in CORE_SURFACES.get_valid_contents() {
-			core_surface.process(sk, &mut self.renderer);
+			core_surface.process(sk, &mut buffer_manager.renderer);
 		}

 		self.display.flush_clients(None);
@@ -197,12 +167,6 @@ impl Wayland {
 			core_surface.frame(sk, output.clone());
 		}
 	}
-
-	pub fn make_context_current(&self) {
-		unsafe {
-			let _ = self.renderer.egl_context().make_current();
-		}
-	}
 }
 impl Drop for Wayland {
 	fn drop(&mut self) {
Author	SHA1	Message	Date
UnderSampled	c6bc1f3ee8	Add support for specifying colorspace for Camera render	2023-10-14 12:28:27 -04:00
UnderSampled	27d8eb5f51	Merge branch 'develop' into camera-items	2023-10-11 00:22:48 -04:00
Nova	2f575954e9	fix: cargo.lock	2023-10-06 11:59:13 -04:00
UnderSampled	828a298476	Specify sRGB for Camera render texture	2023-10-06 11:59:13 -04:00
Nova	9058592ce1	fix(camera item): swap camera/projection matrix	2023-10-06 11:59:13 -04:00
Nova	c96eb14235	refactor(camera item): add todo warning	2023-10-06 11:59:13 -04:00
Nova	6fc1bb2afa	refactor(camera item): pipe messageresponsesender through	2023-10-06 11:59:13 -04:00
UnderSampled	1ee485f3c5	Move BufferInfo to (experimental) Core	2023-10-06 11:59:13 -04:00
UnderSampled	9c62f4fd24	Import Dmabufs into CameraItems during render call. Consider replacing with a separate import_buffers call, or create buffers locally and expose export_buffers (slightly less state required) if this is too slow.	2023-10-06 11:58:28 -04:00
UnderSampled	a1f07f9260	Add camera render code for client buffers	2023-10-06 11:58:18 -04:00
UnderSampled	cd5fc51e98	Begin reworking camera items to accept external buffers and render requests	2023-10-06 11:58:18 -04:00