alex/gb-emu
1
0
Fork 0
Code Pull requests Actions Packages Releases Activity

change deps git location

Browse source
This commit is contained in:
Alex Janka 2024-01-25 10:05:18 +11:00
parent 1eb9552615
commit d7d5d3cea0
5 changed files with 349 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

438
Cargo.lock generated
View file

@ -185,6 +185,18 @@ version = "1.0.0-beta.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f1f8f5a6f3d50d89e3797d7593a50f96bb2aaa20ca0cc7be1fb673232c91d72" checksum = "8f1f8f5a6f3d50d89e3797d7593a50f96bb2aaa20ca0cc7be1fb673232c91d72"
[[package]]
name = "array-concat"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9180feb72ccbc07cfe5ef7fa8bbf86ca71490d5dc9ef8ea02c7298ba94e7f7d"
[[package]]
name = "array-init"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc"
[[package]] [[package]]
name = "arrayref" name = "arrayref"
version = "0.3.7" version = "0.3.7"
@ -214,8 +226,9 @@ dependencies = [
[[package]] [[package]]
name = "ash-molten" name = "ash-molten"
version = "0.15.0+1.2.2" version = "0.16.0+1.2.6"
source = "git+https://github.com/italicsjenga/ash-molten#2da15dbee44a35d029d74250828d00de721998f3" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98f74a813be68cdb39c000d8b0b37a353b4648eae02125664881cf0f69f017fe"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"ash", "ash",
@ -303,7 +316,25 @@ checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
[[package]] [[package]]
name = "baseview" name = "baseview"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/italicsjenga/baseview#1949bda39b673ce8d7c9d6104046388e5af1a944" source = "git+https://github.com/RustAudio/baseview.git?rev=2c1b1a7b0fef1a29a5150a6a8f6fef6a0cbab8c4#2c1b1a7b0fef1a29a5150a6a8f6fef6a0cbab8c4"
dependencies = [
"cocoa 0.24.1",
"core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
"keyboard-types",
"nix 0.22.3",
"objc",
"raw-window-handle 0.5.2",
"uuid 0.8.2",
"winapi",
"x11",
"xcb",
"xcb-util",
]
[[package]]
name = "baseview"
version = "0.1.0"
source = "git+https://git.alexjanka.com/alex/baseview#50a5602bca9b438fd125fb48cf0ade48fd794a36"
dependencies = [ dependencies = [
"cocoa 0.24.1", "cocoa 0.24.1",
"core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
@ -354,7 +385,7 @@ dependencies = [
"regex", "regex",
"rustc-hash", "rustc-hash",
"shlex", "shlex",
"syn 2.0.38", "syn 2.0.48",
] ]
[[package]] [[package]]
@ -394,7 +425,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49fb8528abca6895a5ada33d62aedd538a5c33e77068256483b44a3230270163" checksum = "49fb8528abca6895a5ada33d62aedd538a5c33e77068256483b44a3230270163"
dependencies = [ dependencies = [
"quote", "quote",
"syn 2.0.38", "syn 2.0.48",
]
[[package]]
name = "bitvec"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
dependencies = [
"funty",
"radium",
"tap",
"wyz",
] ]
[[package]] [[package]]
@ -454,6 +497,12 @@ dependencies = [
"objc2 0.4.1", "objc2 0.4.1",
] ]
[[package]]
name = "build-target"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "832133bbabbbaa9fbdba793456a2827627a7d2b8fb96032fa1e7666d7895832b"
[[package]] [[package]]
name = "bumpalo" name = "bumpalo"
version = "3.14.0" version = "3.14.0"
@ -471,6 +520,20 @@ name = "bytemuck"
version = "1.14.0" version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
dependencies = [
"bytemuck_derive",
]
[[package]]
name = "bytemuck_derive"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.48",
]
[[package]] [[package]]
name = "byteorder" name = "byteorder"
@ -487,7 +550,7 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
[[package]] [[package]]
name = "cacao" name = "cacao"
version = "0.4.0-beta2" version = "0.4.0-beta2"
source = "git+https://github.com/italicsjenga/cacao#65b32e79c0a8d088d19799b13e86634f3a64c10b" source = "git+https://git.alexjanka.com/alex/cacao#65b32e79c0a8d088d19799b13e86634f3a64c10b"
dependencies = [ dependencies = [
"bitmask-enum", "bitmask-enum",
"block2 0.2.0-alpha.6", "block2 0.2.0-alpha.6",
@ -639,7 +702,7 @@ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn 2.0.48",
] ]
[[package]] [[package]]
@ -1101,7 +1164,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"strsim", "strsim",
"syn 2.0.38", "syn 2.0.48",
] ]
[[package]] [[package]]
@ -1112,7 +1175,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
dependencies = [ dependencies = [
"darling_core", "darling_core",
"quote", "quote",
"syn 2.0.38", "syn 2.0.48",
] ]
[[package]] [[package]]
@ -1308,7 +1371,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn 2.0.48",
] ]
[[package]] [[package]]
@ -1351,6 +1414,12 @@ dependencies = [
"winit_input_helper", "winit_input_helper",
] ]
[[package]]
name = "funty"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
[[package]] [[package]]
name = "futures" name = "futures"
version = "0.3.29" version = "0.3.29"
@ -1407,7 +1476,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn 2.0.48",
] ]
[[package]] [[package]]
@ -1440,15 +1509,6 @@ dependencies = [
"slab", "slab",
] ]
[[package]]
name = "fxhash"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
dependencies = [
"byteorder",
]
[[package]] [[package]]
name = "gb-emu-lib" name = "gb-emu-lib"
version = "0.5.0" version = "0.5.0"
@ -1465,7 +1525,7 @@ dependencies = [
"librashader", "librashader",
"librashader-common", "librashader-common",
"librashader-presets", "librashader-presets",
"naga 0.13.0", "naga 0.19.0",
"num-traits", "num-traits",
"pixels", "pixels",
"rand", "rand",
@ -1547,6 +1607,26 @@ version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
[[package]]
name = "gl"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a94edab108827d67608095e269cf862e60d920f144a5026d3dbcfd8b877fb404"
dependencies = [
"gl_generator",
]
[[package]]
name = "gl_generator"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
dependencies = [
"khronos_api",
"log",
"xml-rs",
]
[[package]] [[package]]
name = "glob" name = "glob"
version = "0.3.1" version = "0.3.1"
@ -1671,16 +1751,16 @@ dependencies = [
[[package]] [[package]]
name = "hassle-rs" name = "hassle-rs"
version = "0.9.0" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85" checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"com-rs", "com-rs",
"libc", "libc",
"libloading 0.7.4", "libloading 0.7.4",
"thiserror", "thiserror",
"widestring 0.5.1", "widestring",
"winapi", "winapi",
] ]
@ -1812,9 +1892,9 @@ dependencies = [
[[package]] [[package]]
name = "itertools" name = "itertools"
version = "0.11.0" version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
dependencies = [ dependencies = [
"either", "either",
] ]
@ -1948,6 +2028,12 @@ dependencies = [
"pkg-config", "pkg-config",
] ]
[[package]]
name = "khronos_api"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
[[package]] [[package]]
name = "lazy_static" name = "lazy_static"
version = "1.4.0" version = "1.4.0"
@ -1988,8 +2074,8 @@ dependencies = [
[[package]] [[package]]
name = "librashader" name = "librashader"
version = "0.1.4" version = "0.2.0-beta.2"
source = "git+https://github.com/italicsjenga/librashader#e3e2fa63e02a88929ec49ba608fad67ae98e85f1" source = "git+https://git.alexjanka.com/alex/librashader#2d0dd5909defa9eaf9ae067e4522474401c5a9ea"
dependencies = [ dependencies = [
"ash", "ash",
"librashader-cache", "librashader-cache",
@ -1998,13 +2084,17 @@ dependencies = [
"librashader-presets", "librashader-presets",
"librashader-reflect", "librashader-reflect",
"librashader-runtime", "librashader-runtime",
"librashader-runtime-d3d11",
"librashader-runtime-d3d12",
"librashader-runtime-gl",
"librashader-runtime-vk", "librashader-runtime-vk",
"windows 0.48.0",
] ]
[[package]] [[package]]
name = "librashader-cache" name = "librashader-cache"
version = "0.1.4" version = "0.2.0-beta.2"
source = "git+https://github.com/italicsjenga/librashader#e3e2fa63e02a88929ec49ba608fad67ae98e85f1" source = "git+https://git.alexjanka.com/alex/librashader#2d0dd5909defa9eaf9ae067e4522474401c5a9ea"
dependencies = [ dependencies = [
"bincode", "bincode",
"blake3", "blake3",
@ -2015,21 +2105,24 @@ dependencies = [
"rusqlite", "rusqlite",
"serde", "serde",
"thiserror", "thiserror",
"windows 0.48.0",
] ]
[[package]] [[package]]
name = "librashader-common" name = "librashader-common"
version = "0.1.4" version = "0.2.0-beta.2"
source = "git+https://github.com/italicsjenga/librashader#e3e2fa63e02a88929ec49ba608fad67ae98e85f1" source = "git+https://git.alexjanka.com/alex/librashader#2d0dd5909defa9eaf9ae067e4522474401c5a9ea"
dependencies = [ dependencies = [
"ash", "ash",
"gl",
"num-traits", "num-traits",
"windows 0.48.0",
] ]
[[package]] [[package]]
name = "librashader-preprocess" name = "librashader-preprocess"
version = "0.1.4" version = "0.2.0-beta.2"
source = "git+https://github.com/italicsjenga/librashader#e3e2fa63e02a88929ec49ba608fad67ae98e85f1" source = "git+https://git.alexjanka.com/alex/librashader#2d0dd5909defa9eaf9ae067e4522474401c5a9ea"
dependencies = [ dependencies = [
"encoding_rs", "encoding_rs",
"librashader-common", "librashader-common",
@ -2040,8 +2133,8 @@ dependencies = [
[[package]] [[package]]
name = "librashader-presets" name = "librashader-presets"
version = "0.1.4" version = "0.2.0-beta.2"
source = "git+https://github.com/italicsjenga/librashader#e3e2fa63e02a88929ec49ba608fad67ae98e85f1" source = "git+https://git.alexjanka.com/alex/librashader#2d0dd5909defa9eaf9ae067e4522474401c5a9ea"
dependencies = [ dependencies = [
"librashader-common", "librashader-common",
"nom", "nom",
@ -2052,8 +2145,8 @@ dependencies = [
[[package]] [[package]]
name = "librashader-reflect" name = "librashader-reflect"
version = "0.1.4" version = "0.2.0-beta.2"
source = "git+https://github.com/italicsjenga/librashader#e3e2fa63e02a88929ec49ba608fad67ae98e85f1" source = "git+https://git.alexjanka.com/alex/librashader#2d0dd5909defa9eaf9ae067e4522474401c5a9ea"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"bytemuck", "bytemuck",
@ -2064,13 +2157,14 @@ dependencies = [
"rustc-hash", "rustc-hash",
"serde", "serde",
"shaderc", "shaderc",
"spirv-to-dxil",
"thiserror", "thiserror",
] ]
[[package]] [[package]]
name = "librashader-runtime" name = "librashader-runtime"
version = "0.1.4" version = "0.2.0-beta.2"
source = "git+https://github.com/italicsjenga/librashader#e3e2fa63e02a88929ec49ba608fad67ae98e85f1" source = "git+https://git.alexjanka.com/alex/librashader#2d0dd5909defa9eaf9ae067e4522474401c5a9ea"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"image", "image",
@ -2082,10 +2176,73 @@ dependencies = [
"rustc-hash", "rustc-hash",
] ]
[[package]]
name = "librashader-runtime-d3d11"
version = "0.2.0-beta.2"
source = "git+https://git.alexjanka.com/alex/librashader#2d0dd5909defa9eaf9ae067e4522474401c5a9ea"
dependencies = [
"array-concat",
"bytemuck",
"librashader-cache",
"librashader-common",
"librashader-preprocess",
"librashader-presets",
"librashader-reflect",
"librashader-runtime",
"librashader-spirv-cross",
"rayon",
"rustc-hash",
"thiserror",
"windows 0.48.0",
]
[[package]]
name = "librashader-runtime-d3d12"
version = "0.2.0-beta.2"
source = "git+https://git.alexjanka.com/alex/librashader#2d0dd5909defa9eaf9ae067e4522474401c5a9ea"
dependencies = [
"array-concat",
"array-init",
"bitvec",
"bytemuck",
"librashader-cache",
"librashader-common",
"librashader-preprocess",
"librashader-presets",
"librashader-reflect",
"librashader-runtime",
"librashader-spirv-cross",
"parking_lot",
"rayon",
"rustc-hash",
"thiserror",
"widestring",
"windows 0.48.0",
]
[[package]]
name = "librashader-runtime-gl"
version = "0.2.0-beta.2"
source = "git+https://git.alexjanka.com/alex/librashader#2d0dd5909defa9eaf9ae067e4522474401c5a9ea"
dependencies = [
"bytemuck",
"gl",
"librashader-cache",
"librashader-common",
"librashader-preprocess",
"librashader-presets",
"librashader-reflect",
"librashader-runtime",
"librashader-spirv-cross",
"rayon",
"rustc-hash",
"thiserror",
]
[[package]] [[package]]
name = "librashader-runtime-vk" name = "librashader-runtime-vk"
version = "0.1.4" version = "0.2.0-beta.2"
source = "git+https://github.com/italicsjenga/librashader#e3e2fa63e02a88929ec49ba608fad67ae98e85f1" source = "git+https://git.alexjanka.com/alex/librashader#2d0dd5909defa9eaf9ae067e4522474401c5a9ea"
dependencies = [ dependencies = [
"ash", "ash",
"bytemuck", "bytemuck",
@ -2319,9 +2476,9 @@ dependencies = [
[[package]] [[package]]
name = "naga" name = "naga"
version = "0.11.1" version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c3d4269bcb7d50121097702fde1afb75f4ea8083aeb7a55688dcf289a853271" checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb"
dependencies = [ dependencies = [
"bit-set", "bit-set",
"bitflags 1.3.2", "bitflags 1.3.2",
@ -2331,7 +2488,7 @@ dependencies = [
"log", "log",
"num-traits", "num-traits",
"rustc-hash", "rustc-hash",
"spirv", "spirv 0.2.0+1.5.4",
"termcolor", "termcolor",
"thiserror", "thiserror",
"unicode-xid", "unicode-xid",
@ -2339,19 +2496,19 @@ dependencies = [
[[package]] [[package]]
name = "naga" name = "naga"
version = "0.13.0" version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e" checksum = "8878eb410fc90853da3908aebfe61d73d26d4437ef850b70050461f939509899"
dependencies = [ dependencies = [
"bit-set", "bit-set",
"bitflags 2.4.1", "bitflags 2.4.1",
"codespan-reporting", "codespan-reporting",
"hexf-parse", "hexf-parse",
"indexmap 1.9.3", "indexmap 2.0.2",
"log", "log",
"num-traits", "num-traits",
"rustc-hash", "rustc-hash",
"spirv", "spirv 0.3.0+sdk-1.3.268.0",
"termcolor", "termcolor",
"thiserror", "thiserror",
"unicode-xid", "unicode-xid",
@ -2443,14 +2600,14 @@ dependencies = [
[[package]] [[package]]
name = "nih_plug" name = "nih_plug"
version = "0.0.0" version = "0.0.0"
source = "git+https://github.com/italicsjenga/nih-plug?branch=raw-window-handle-0.5.0#0ed59b849845a21f3ebdc32c4c0e4ff764493f29" source = "git+https://github.com/robbert-vdh/nih-plug#7a01b57735bb0cb18da048e4eb5b303b85b30c4d"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"anymap", "anymap",
"atomic_float", "atomic_float",
"atomic_refcell", "atomic_refcell",
"backtrace", "backtrace",
"baseview", "baseview 0.1.0 (git+https://github.com/RustAudio/baseview.git?rev=2c1b1a7b0fef1a29a5150a6a8f6fef6a0cbab8c4)",
"bitflags 1.3.2", "bitflags 1.3.2",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"clap", "clap",
@ -2473,14 +2630,14 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"vst3-sys", "vst3-sys",
"widestring 1.0.2", "widestring",
"windows 0.44.0", "windows 0.44.0",
] ]
[[package]] [[package]]
name = "nih_plug_derive" name = "nih_plug_derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/italicsjenga/nih-plug?branch=raw-window-handle-0.5.0#0ed59b849845a21f3ebdc32c4c0e4ff764493f29" source = "git+https://github.com/robbert-vdh/nih-plug#7a01b57735bb0cb18da048e4eb5b303b85b30c4d"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2490,7 +2647,7 @@ dependencies = [
[[package]] [[package]]
name = "nih_plug_xtask" name = "nih_plug_xtask"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/italicsjenga/nih-plug?branch=raw-window-handle-0.5.0#0ed59b849845a21f3ebdc32c4c0e4ff764493f29" source = "git+https://github.com/robbert-vdh/nih-plug#7a01b57735bb0cb18da048e4eb5b303b85b30c4d"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"goblin", "goblin",
@ -2689,7 +2846,7 @@ dependencies = [
"proc-macro-crate", "proc-macro-crate",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn 2.0.48",
] ]
[[package]] [[package]]
@ -2899,7 +3056,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn 2.0.48",
] ]
[[package]] [[package]]
@ -2916,9 +3073,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]] [[package]]
name = "pixels" name = "pixels"
version = "0.12.1" version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8a87d67cc8f4592a5313b37ce395e8965dd8284492a85f19478af941a4df257" checksum = "8ba8189b31db4f12fbf0d4a8eab2d7d7343a504a8d8a7ea4b14ffb2e6129136a"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"pollster", "pollster",
@ -2992,9 +3149,9 @@ dependencies = [
[[package]] [[package]]
name = "pollster" name = "pollster"
version = "0.2.5" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7" checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2"
[[package]] [[package]]
name = "powerfmt" name = "powerfmt"
@ -3020,9 +3177,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.69" version = "1.0.78"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -3044,13 +3201,19 @@ dependencies = [
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.33" version = "1.0.35"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
] ]
[[package]]
name = "radium"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
[[package]] [[package]]
name = "rand" name = "rand"
version = "0.8.5" version = "0.8.5"
@ -3209,9 +3372,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
[[package]] [[package]]
name = "renderdoc-sys" name = "renderdoc-sys"
version = "0.7.1" version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b"
[[package]] [[package]]
name = "rgb" name = "rgb"
@ -3359,7 +3522,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn 2.0.48",
] ]
[[package]] [[package]]
@ -3398,7 +3561,7 @@ checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn 2.0.48",
] ]
[[package]] [[package]]
@ -3447,14 +3610,14 @@ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn 2.0.48",
] ]
[[package]] [[package]]
name = "shaderc" name = "shaderc"
version = "0.8.2" version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31cef52787a0db5108788ea20bed13d6bf4b96287c5c5201e55725f7070f3443" checksum = "27e07913ada18607bb60d12431cbe3358d3bbebbe95948e1618851dc01e63b7b"
dependencies = [ dependencies = [
"libc", "libc",
"shaderc-sys", "shaderc-sys",
@ -3462,9 +3625,9 @@ dependencies = [
[[package]] [[package]]
name = "shaderc-sys" name = "shaderc-sys"
version = "0.8.2" version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e8f8439fffcffd6efcd74197204addf935dbab5752696bd990a6cd36d54cf64" checksum = "73120d240fe22196300f39ca8547ca2d014960f27b19b47b21288b396272f7f7"
dependencies = [ dependencies = [
"cmake", "cmake",
"libc", "libc",
@ -3560,6 +3723,37 @@ dependencies = [
"num-traits", "num-traits",
] ]
[[package]]
name = "spirv"
version = "0.3.0+sdk-1.3.268.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
dependencies = [
"bitflags 2.4.1",
]
[[package]]
name = "spirv-to-dxil"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ce8b35efd4e676abda599d43a3ddf8771bd77364631745a7254079021d55895"
dependencies = [
"bytemuck",
"spirv-to-dxil-sys",
"thiserror",
]
[[package]]
name = "spirv-to-dxil-sys"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "159f154ac0277748c193b397a72d27ee664446547dfa9a2589cf7a7bd9a01e5e"
dependencies = [
"build-target",
"bytemuck",
"cc",
]
[[package]] [[package]]
name = "static_assertions" name = "static_assertions"
version = "1.1.0" version = "1.1.0"
@ -3591,9 +3785,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.38" version = "2.0.48"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3601,10 +3795,16 @@ dependencies = [
] ]
[[package]] [[package]]
name = "termcolor" name = "tap"
version = "1.3.0" version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
[[package]]
name = "termcolor"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
dependencies = [ dependencies = [
"winapi-util", "winapi-util",
] ]
@ -3621,22 +3821,22 @@ dependencies = [
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.50" version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
dependencies = [ dependencies = [
"thiserror-impl", "thiserror-impl",
] ]
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "1.0.50" version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn 2.0.48",
] ]
[[package]] [[package]]
@ -3782,7 +3982,7 @@ name = "twinc_emu_vst"
version = "0.5.0" version = "0.5.0"
dependencies = [ dependencies = [
"async-ringbuf", "async-ringbuf",
"baseview", "baseview 0.1.0 (git+https://git.alexjanka.com/alex/baseview)",
"futures", "futures",
"gb-emu-lib", "gb-emu-lib",
"keyboard-types", "keyboard-types",
@ -3973,7 +4173,7 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn 2.0.48",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -4007,7 +4207,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn 2.0.48",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -4155,15 +4355,15 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
[[package]] [[package]]
name = "wgpu" name = "wgpu"
version = "0.15.1" version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7" checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"js-sys", "js-sys",
"log", "log",
"naga 0.11.1", "naga 0.12.3",
"parking_lot", "parking_lot",
"profiling", "profiling",
"raw-window-handle 0.5.2", "raw-window-handle 0.5.2",
@ -4179,20 +4379,20 @@ dependencies = [
[[package]] [[package]]
name = "wgpu-core" name = "wgpu-core"
version = "0.15.1" version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"bit-vec", "bit-vec",
"bitflags 1.3.2", "bitflags 2.4.1",
"codespan-reporting", "codespan-reporting",
"fxhash",
"log", "log",
"naga 0.11.1", "naga 0.12.3",
"parking_lot", "parking_lot",
"profiling", "profiling",
"raw-window-handle 0.5.2", "raw-window-handle 0.5.2",
"rustc-hash",
"smallvec", "smallvec",
"thiserror", "thiserror",
"web-sys", "web-sys",
@ -4202,20 +4402,19 @@ dependencies = [
[[package]] [[package]]
name = "wgpu-hal" name = "wgpu-hal"
version = "0.15.4" version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b" checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448"
dependencies = [ dependencies = [
"android_system_properties", "android_system_properties",
"arrayvec", "arrayvec",
"ash", "ash",
"bit-set", "bit-set",
"bitflags 1.3.2", "bitflags 2.4.1",
"block", "block",
"core-graphics-types 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics-types 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"d3d12", "d3d12",
"foreign-types 0.3.2", "foreign-types 0.3.2",
"fxhash",
"glow", "glow",
"gpu-alloc", "gpu-alloc",
"gpu-allocator", "gpu-allocator",
@ -4224,16 +4423,17 @@ dependencies = [
"js-sys", "js-sys",
"khronos-egl", "khronos-egl",
"libc", "libc",
"libloading 0.7.4", "libloading 0.8.1",
"log", "log",
"metal 0.24.0", "metal 0.24.0",
"naga 0.11.1", "naga 0.12.3",
"objc", "objc",
"parking_lot", "parking_lot",
"profiling", "profiling",
"range-alloc", "range-alloc",
"raw-window-handle 0.5.2", "raw-window-handle 0.5.2",
"renderdoc-sys", "renderdoc-sys",
"rustc-hash",
"smallvec", "smallvec",
"thiserror", "thiserror",
"wasm-bindgen", "wasm-bindgen",
@ -4244,11 +4444,11 @@ dependencies = [
[[package]] [[package]]
name = "wgpu-types" name = "wgpu-types"
version = "0.15.2" version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 2.4.1",
"js-sys", "js-sys",
"web-sys", "web-sys",
] ]
@ -4263,12 +4463,6 @@ dependencies = [
"safe_arch", "safe_arch",
] ]
[[package]]
name = "widestring"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
[[package]] [[package]]
name = "widestring" name = "widestring"
version = "1.0.2" version = "1.0.2"
@ -4348,6 +4542,15 @@ dependencies = [
"windows-targets 0.42.2", "windows-targets 0.42.2",
] ]
[[package]]
name = "windows"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
"windows-targets 0.48.5",
]
[[package]] [[package]]
name = "windows" name = "windows"
version = "0.51.1" version = "0.51.1"
@ -4566,6 +4769,15 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "wyz"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
dependencies = [
"tap",
]
[[package]] [[package]]
name = "x11" name = "x11"
version = "2.21.0" version = "2.21.0"
@ -4662,6 +4874,12 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621"
[[package]]
name = "xml-rs"
version = "0.8.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
[[package]] [[package]]
name = "xmlparser" name = "xmlparser"
version = "0.13.6" version = "0.13.6"
@ -4692,5 +4910,5 @@ checksum = "4b27b1bb92570f989aac0ab7e9cbfbacdd65973f7ee920d9f0e71ebac878fd0b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn 2.0.48",
] ]

24
Cargo.toml
View file

@ -6,16 +6,14 @@ resolver = "2"
[workspace.dependencies] [workspace.dependencies]
gb-emu-lib = { path = "./lib", features = ["config"] } gb-emu-lib = { path = "./lib", features = ["config"] }
frontend-common = { path = "./frontend-common" } frontend-common = { path = "./frontend-common" }
baseview = { git = "https://github.com/italicsjenga/baseview" } baseview = { git = "https://git.alexjanka.com/alex/baseview" }
nih_plug = { git = "https://github.com/italicsjenga/nih-plug", branch = "raw-window-handle-0.5.0" } nih_plug = { git = "https://github.com/robbert-vdh/nih-plug" }
nih_plug_xtask = { git = "https://github.com/italicsjenga/nih-plug", branch = "raw-window-handle-0.5.0" } nih_plug_xtask = { git = "https://github.com/robbert-vdh/nih-plug" }
librashader = { git = "https://git.alexjanka.com/alex/librashader" }
[patch.crates-io] librashader-common = { git = "https://git.alexjanka.com/alex/librashader" }
librashader = { git = "https://github.com/italicsjenga/librashader" } librashader-presets = { git = "https://git.alexjanka.com/alex/librashader" }
librashader-common = { git = "https://github.com/italicsjenga/librashader" } librashader-preprocess = { git = "https://git.alexjanka.com/alex/librashader" }
librashader-presets = { git = "https://github.com/italicsjenga/librashader" } librashader-reflect = { git = "https://git.alexjanka.com/alex/librashader" }
librashader-preprocess = { git = "https://github.com/italicsjenga/librashader" } librashader-runtime = { git = "https://git.alexjanka.com/alex/librashader" }
librashader-reflect = { git = "https://github.com/italicsjenga/librashader" } librashader-runtime-vk = { git = "https://git.alexjanka.com/alex/librashader" }
librashader-runtime = { git = "https://github.com/italicsjenga/librashader" } librashader-cache = { git = "https://git.alexjanka.com/alex/librashader" }
librashader-runtime-vk = { git = "https://github.com/italicsjenga/librashader" }
librashader-cache = { git = "https://github.com/italicsjenga/librashader" }

2
gui/Cargo.toml
View file

@ -17,7 +17,7 @@ gb-emu-lib = { workspace = true }
twinc_emu_vst = { path = "../gb-vst", default-features = false } twinc_emu_vst = { path = "../gb-vst", default-features = false }
[target.'cfg(any(target_os = "macos"))'.dependencies] [target.'cfg(any(target_os = "macos"))'.dependencies]
cacao = { git = "https://github.com/italicsjenga/cacao" } cacao = { git = "https://git.alexjanka.com/alex/cacao" }
objc = { version = "=0.3.0-beta.3", package = "objc2" } objc = { version = "=0.3.0-beta.3", package = "objc2" }
uuid = { version = "1.6", features = ["v4", "fast-rng"] } uuid = { version = "1.6", features = ["v4", "fast-rng"] }
raw-window-handle = { version = "0.5" } raw-window-handle = { version = "0.5" }

16
lib/Cargo.toml
View file

@ -25,26 +25,24 @@ error-colour = []
rand = "0.8.5" rand = "0.8.5"
async-ringbuf = "0.1" async-ringbuf = "0.1"
futures = "0.3" futures = "0.3"
itertools = "0.11" itertools = "0.12"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_with = "3.0" serde_with = "3.0"
bytemuck = "1.14" bytemuck = "1.14"
num-traits = "0.2" num-traits = "0.2"
pixels = { version = "0.12", optional = true } pixels = { version = "0.13", optional = true }
ash = { version = "0.37", features = ["linked"], optional = true } ash = { version = "0.37", features = ["linked"], optional = true }
ash-window = { version = "0.12", optional = true } ash-window = { version = "0.12", optional = true }
raw-window-handle = { version = "0.5", optional = true } raw-window-handle = { version = "0.5", optional = true }
librashader = { version = "0.1", optional = true, default-features = false, features = [ librashader = { workspace = true, optional = true }
"runtime-vk", librashader-presets = { workspace = true, optional = true }
] } librashader-common = { workspace = true, optional = true }
librashader-presets = { version = "0.1", optional = true }
librashader-common = { version = "0.1", optional = true }
directories = { version = "5.0", optional = true } directories = { version = "5.0", optional = true }
ron = { version = "0.8", optional = true } ron = { version = "0.8", optional = true }
lazy_static = "1.4" lazy_static = "1.4"
[build-dependencies] [build-dependencies]
naga = { version = "0.13", optional = true, features = ["wgsl-in", "spv-out"] } naga = { version = "0.19", optional = true, features = ["wgsl-in", "spv-out"] }
[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies] [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
ash-molten = { git = "https://github.com/italicsjenga/ash-molten", optional = true } ash-molten = { version = "0.16.0", optional = true }

2
lib/src/renderer/vulkan/types.rs
View file

@ -14,6 +14,8 @@ use super::{
pub(super) const SHADER_INPUT_FORMAT: vk::Format = vk::Format::R8G8B8A8_UNORM; pub(super) const SHADER_INPUT_FORMAT: vk::Format = vk::Format::R8G8B8A8_UNORM;
#[derive(Clone, Debug, Copy)] #[derive(Clone, Debug, Copy)]
// for some reason the compiler doesn't think we use these fields?
#[allow(dead_code)]
pub(super) struct Vertex(pub(super) f32, pub(super) f32); pub(super) struct Vertex(pub(super) f32, pub(super) f32);
pub(super) struct VulkanData { pub(super) struct VulkanData {