From 402e236a1e00fe213a936e0de19fdbd5b0d13151 Mon Sep 17 00:00:00 2001 From: AdrianEddy Date: Tue, 31 Oct 2023 21:58:19 +0100 Subject: [PATCH] Try harder with the log file and update to latest core --- Cargo.lock | 245 ++++++++++++++++++++++++++++-------------------- Cargo.toml | 7 +- README.md | 1 - src/gyroflow.rs | 11 ++- 4 files changed, 155 insertions(+), 109 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9911413..6b23d4a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,14 +19,14 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", "once_cell", "version_check", - "zerocopy 0.7.12", + "zerocopy 0.7.20", ] [[package]] @@ -286,7 +286,7 @@ checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ "async-channel", "async-executor", - "async-io", + "async-io 1.13.0", "async-lock", "blocking", "futures-lite", @@ -306,13 +306,33 @@ dependencies = [ "futures-lite", "log", "parking", - "polling", - "rustix 0.37.26", + "polling 2.8.0", + "rustix 0.37.27", "slab", "socket2", "waker-fn", ] +[[package]] +name = "async-io" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10da8f3146014722c89e7859e1d7bb97873125d7346d10ca642ffab794355828" +dependencies = [ + "async-lock", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling 3.3.0", + "rustix 0.38.21", + "slab", + "tracing", + "waker-fn", + "windows-sys 0.48.0", +] + [[package]] name = "async-lock" version = "2.8.0" @@ -328,14 +348,14 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", + "async-io 1.13.0", "async-lock", "async-signal", "blocking", "cfg-if", - "event-listener 3.0.0", + "event-listener 3.0.1", "futures-lite", - "rustix 0.38.20", + "rustix 0.38.21", "windows-sys 0.48.0", ] @@ -352,17 +372,17 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io", + "async-io 2.1.0", "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.20", + "rustix 0.38.21", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -376,7 +396,7 @@ checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ "async-channel", "async-global-executor", - "async-io", + "async-io 1.13.0", "async-lock", "crossbeam-utils", "futures-channel", @@ -812,9 +832,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -958,8 +978,7 @@ dependencies = [ [[package]] name = "d3d12" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=862aff9#862aff94479cd329c4c98e7a8249fe3b240c2a3f" dependencies = [ "bitflags 2.4.1", "libloading 0.8.1", @@ -1171,9 +1190,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" dependencies = [ "concurrent-queue", "parking", @@ -1187,7 +1206,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" dependencies = [ "bit_field", - "flume 0.10.14", + "flume", "half 2.3.1", "lebe", "miniz_oxide", @@ -1291,18 +1310,6 @@ dependencies = [ "spin", ] -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "spin", -] - [[package]] name = "foreign-types" version = "0.5.0" @@ -1353,18 +1360,18 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-intrusive" @@ -1379,9 +1386,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -1400,9 +1407,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", @@ -1411,21 +1418,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-core", "futures-io", @@ -1592,7 +1599,7 @@ dependencies = [ [[package]] name = "gyroflow-core" version = "1.5.3" -source = "git+https://github.com/gyroflow/gyroflow.git?rev=d9d5195#d9d5195c629af41a18302de158a47329dfdff2c7" +source = "git+https://github.com/gyroflow/gyroflow.git?rev=3798993#3798993d09dc682b16ebd41564adbe62b16c289e" dependencies = [ "ahrs", "akaze", @@ -1673,7 +1680,7 @@ dependencies = [ [[package]] name = "gyroflow-ofx" -version = "1.0.10" +version = "1.2.2" dependencies = [ "fastrand 2.0.1", "gyroflow-core", @@ -2173,8 +2180,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.26.0" -source = "git+https://github.com/gfx-rs/metal-rs/?rev=d24f1a4#d24f1a4ae92470bf87a0c65ecfe78c9299835505" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ "bitflags 2.4.1", "block", @@ -2220,8 +2228,8 @@ dependencies = [ [[package]] name = "naga" -version = "0.13.0" -source = "git+https://github.com/gfx-rs/naga?rev=e25280df9316434ef7752970016d01a3aede3f17#e25280df9316434ef7752970016d01a3aede3f17" +version = "0.14.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=862aff9#862aff94479cd329c4c98e7a8249fe3b240c2a3f" dependencies = [ "bit-set", "bitflags 2.4.1", @@ -2486,20 +2494,20 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb" +checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" +checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 2.0.38", @@ -2782,6 +2790,20 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "polling" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.21", + "tracing", + "windows-sys 0.48.0", +] + [[package]] name = "pollster" version = "0.3.0" @@ -2865,7 +2887,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", ] [[package]] @@ -3083,7 +3114,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c9e7b57df6e8472152674607f6cc68aa14a748a3157a857a94f516e11aeacc2" dependencies = [ "ashpd", - "async-io", + "async-io 1.13.0", "block", "dispatch", "futures-util", @@ -3168,9 +3199,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.26" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", @@ -3182,9 +3213,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.20" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ "bitflags 2.4.1", "errno", @@ -3269,18 +3300,18 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.189" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", @@ -3289,9 +3320,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "indexmap", "itoa", @@ -3301,9 +3332,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", @@ -3312,9 +3343,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ "indexmap", "itoa", @@ -3496,7 +3527,7 @@ checksum = "5cce2183deb9e7ada727867823fb8bbbc8b56e503801a332d155dde613130e1b" [[package]] name = "stabilize_spirv" version = "0.0.0" -source = "git+https://github.com/gyroflow/gyroflow.git?rev=d9d5195#d9d5195c629af41a18302de158a47329dfdff2c7" +source = "git+https://github.com/gyroflow/gyroflow.git?rev=3798993#3798993d09dc682b16ebd41564adbe62b16c289e" dependencies = [ "spirv-std", ] @@ -3567,7 +3598,7 @@ dependencies = [ [[package]] name = "telemetry-parser" version = "0.2.8" -source = "git+https://github.com/AdrianEddy/telemetry-parser.git?rev=36dec52#36dec52e833a549960ffb2b63a486efa644a34e5" +source = "git+https://github.com/AdrianEddy/telemetry-parser.git?rev=1f92212#1f9221210d636f1b5099f2ebc7176ad716b2422c" dependencies = [ "argh", "byteorder", @@ -3589,14 +3620,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand 2.0.1", - "redox_syscall 0.3.5", - "rustix 0.38.20", + "redox_syscall 0.4.1", + "rustix 0.38.21", "windows-sys 0.48.0", ] @@ -3712,6 +3743,17 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + [[package]] name = "topology-traits" version = "0.1.2" @@ -3987,18 +4029,17 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "wgpu" -version = "0.17.0" -source = "git+https://github.com/gfx-rs/wgpu.git?rev=dd9b282#dd9b282c72a696ffaee100b69e7c8e37668e6149" +version = "0.18.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=862aff9#862aff94479cd329c4c98e7a8249fe3b240c2a3f" dependencies = [ "arrayvec 0.7.4", "cfg-if", - "flume 0.11.0", "js-sys", "log", "naga", "parking_lot", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", "smallvec", "static_assertions", "wasm-bindgen", @@ -4011,8 +4052,8 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.17.0" -source = "git+https://github.com/gfx-rs/wgpu.git?rev=dd9b282#dd9b282c72a696ffaee100b69e7c8e37668e6149" +version = "0.18.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=862aff9#862aff94479cd329c4c98e7a8249fe3b240c2a3f" dependencies = [ "arrayvec 0.7.4", "bit-vec", @@ -4022,7 +4063,7 @@ dependencies = [ "naga", "parking_lot", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", "rustc-hash", "smallvec", "thiserror", @@ -4033,8 +4074,8 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.17.0" -source = "git+https://github.com/gfx-rs/wgpu.git?rev=dd9b282#dd9b282c72a696ffaee100b69e7c8e37668e6149" +version = "0.18.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=862aff9#862aff94479cd329c4c98e7a8249fe3b240c2a3f" dependencies = [ "android_system_properties", "arrayvec 0.7.4", @@ -4062,7 +4103,7 @@ dependencies = [ "parking_lot", "profiling", "range-alloc", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", "renderdoc-sys", "rustc-hash", "smallvec", @@ -4075,8 +4116,8 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.17.0" -source = "git+https://github.com/gfx-rs/wgpu.git?rev=dd9b282#dd9b282c72a696ffaee100b69e7c8e37668e6149" +version = "0.18.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=862aff9#862aff94479cd329c4c98e7a8249fe3b240c2a3f" dependencies = [ "bitflags 2.4.1", "js-sys", @@ -4292,9 +4333,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.17" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" dependencies = [ "memchr", ] @@ -4339,7 +4380,7 @@ dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io", + "async-io 1.13.0", "async-lock", "async-process", "async-recursion", @@ -4377,7 +4418,7 @@ version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "regex", @@ -4408,11 +4449,11 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.12" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8db0ac2df3d060f81ec0380ccc5b71c2a7c092cfced671feeee1320e95559c87" +checksum = "dd66a62464e3ffd4e37bd09950c2b9dd6c4f8767380fabba0d523f9a775bc85a" dependencies = [ - "zerocopy-derive 0.7.12", + "zerocopy-derive 0.7.20", ] [[package]] @@ -4428,9 +4469,9 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.7.12" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b6093bc6d5265ff40b479c834cdd25d8e20784781a2a29a8106327393d0a9ff" +checksum = "255c4596d41e6916ced49cfafea18727b24d67878fa180ddfd69b9df34fd1726" dependencies = [ "proc-macro2", "quote", @@ -4467,7 +4508,7 @@ version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", diff --git a/Cargo.toml b/Cargo.toml index 9580614..231bda4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "gyroflow-ofx" -version = "1.0.10" +version = "1.2.2" authors = ["Ilya Epifanov ", "Adrian "] license = "GPL-3.0-or-later" edition = "2021" @@ -16,7 +16,7 @@ ofx = "0.3" log = "0.4" itertools = "0.11" lru = "0.12" -gyroflow-core = { git = "https://github.com/gyroflow/gyroflow.git", default-features = false, rev = "d9d5195", features = ["bundle-lens-profiles"] } +gyroflow-core = { git = "https://github.com/gyroflow/gyroflow.git", default-features = false, rev = "3798993", features = ["bundle-lens-profiles"] } #gyroflow-core = { path = "../gyroflow/src/core", default-features = false, features = ["bundle-lens-profiles"] } log-panics = "2.1" rfd = { version = "0.12", default-features = false, features = ["xdg-portal"] } @@ -26,7 +26,7 @@ fastrand = "2.0.1" simplelog = "0.12" [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies.metal] -version = "0.26.0" +version = "0.27.0" [features] default = ["use-opencl"] @@ -45,4 +45,3 @@ ofx = { git = "https://github.com/AdrianEddy/ofx-rs.git", rev = "9f96aa7" } ofx_sys = { git = "https://github.com/AdrianEddy/ofx-rs.git", rev = "9f96aa7" } #ofx = { path = "../ofx-rs/ofx" } #ofx_sys = { path = "../ofx-rs/ofx-sys" } -metal = { git = "https://github.com/gfx-rs/metal-rs/", rev = "d24f1a4" } diff --git a/README.md b/README.md index ae66f67..68e389e 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@ Grab the archive for your OS from the [releases page](https://github.com/gyroflo Copy the `Gyroflow.ofx.bundle` from the archive into the `/Library/OFX/Plugins` directory. Create the directory if it doesn't exist yet. -You will probably need to open System Preferences -> Security and Allow plugin from unknown developer. Then restart Resolve. Then in Resolve, make sure to go to Preferences -> Video plugins and enable Gyroflow.ofx.bundle. ## Windows diff --git a/src/gyroflow.rs b/src/gyroflow.rs index 1c44db2..5b3201f 100644 --- a/src/gyroflow.rs +++ b/src/gyroflow.rs @@ -1292,12 +1292,19 @@ impl Execute for GyroflowPlugin { .fold(simplelog::ConfigBuilder::new(), |mut cfg, x| { cfg.add_filter_ignore_str(x); cfg }) .build(); - if let Ok(file_log) = std::fs::File::create(log_path) { + if let Ok(file_log) = std::fs::File::create(&log_path) { let _ = simplelog::WriteLogger::init(log::LevelFilter::Debug, log_config, file_log); self.log_initialized = true; - } else if let Ok(file_log) = std::fs::File::create(tmp_log) { + } else if let Ok(file_log) = std::fs::File::create(&tmp_log) { let _ = simplelog::WriteLogger::init(log::LevelFilter::Debug, log_config, file_log); self.log_initialized = true; + } else if cfg!(target_os = "linux") { + if let Ok(file_log) = std::fs::File::create("/tmp/gyroflow-ofx.log") { + let _ = simplelog::WriteLogger::init(log::LevelFilter::Debug, log_config, file_log); + self.log_initialized = true; + } else { + eprintln!("Failed to create log file: {log_path:?}, {tmp_log:?}, /tmp/gyroflow-ofx.log"); + } } }