1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
|
Relax Linux checks for the code works on any non-Windows platform.
--- cargo-crates/wgpu-26.0.1/build.rs.orig 2006-07-24 01:21:28 UTC
+++ cargo-crates/wgpu-26.0.1/build.rs
@@ -16,7 +16,7 @@ fn main() {
metal: { all(target_vendor = "apple", feature = "metal") },
vulkan: { any(
// The `vulkan` feature enables the Vulkan backend only on "native Vulkan" platforms, i.e. Windows/Linux/Android
- all(any(windows, target_os = "linux", target_os = "android"), feature = "vulkan"),
+ all(any(windows, unix), not(target_vendor = "apple"), feature = "vulkan"),
// On Apple platforms, however, we require the `vulkan-portability` feature
// to explicitly opt-in to Vulkan since it's meant to be used with MoltenVK.
all(target_vendor = "apple", feature = "vulkan-portability")
@@ -24,7 +24,7 @@ fn main() {
gles: { any(
// The `gles` feature enables the OpenGL/GLES backend only on "native OpenGL" platforms, i.e. Windows, Linux, Android, and Emscripten.
// (Note that WebGL is also not included here!)
- all(any(windows, target_os = "linux", target_os = "android", Emscripten), feature = "gles"),
+ all(any(windows, unix, Emscripten), not(target_vendor = "apple"), feature = "gles"),
// On Apple platforms, however, we require the `angle` feature to explicitly opt-in to OpenGL
// since its meant to be used with ANGLE.
all(target_vendor = "apple", feature = "angle")
--- cargo-crates/wgpu-core-26.0.1/Cargo.toml.orig 1970-01-01 00:00:01 UTC
+++ cargo-crates/wgpu-core-26.0.1/Cargo.toml
@@ -206,7 +206,7 @@ optional = true
version = "26.0.0"
optional = true
-[target.'cfg(any(windows, target_os = "linux", target_os = "android"))'.dependencies.wgpu-core-deps-windows-linux-android]
+[target.'cfg(all(any(windows, unix), not(target_vendor = "apple")))'.dependencies.wgpu-core-deps-windows-linux-android]
version = "26.0.0"
optional = true
--- cargo-crates/wgpu-core-26.0.1/build.rs.orig 2006-07-24 01:21:28 UTC
+++ cargo-crates/wgpu-core-26.0.1/build.rs
@@ -1,6 +1,6 @@ fn main() {
fn main() {
cfg_aliases::cfg_aliases! {
- windows_linux_android: { any(windows, target_os = "linux", target_os = "android") },
+ windows_linux_android: { all(any(windows, unix), not(target_vendor = "apple")) },
send_sync: { all(
feature = "std",
any(
--- cargo-crates/wgpu-core-deps-windows-linux-android-26.0.0/Cargo.toml.orig 1970-01-01 00:00:01 UTC
+++ cargo-crates/wgpu-core-deps-windows-linux-android-26.0.0/Cargo.toml
@@ -38,5 +38,5 @@ vulkan = ["wgpu-hal/vulkan"]
renderdoc = ["wgpu-hal/renderdoc"]
vulkan = ["wgpu-hal/vulkan"]
-[target.'cfg(any(windows, target_os = "linux", target_os = "android"))'.dependencies.wgpu-hal]
+[target.'cfg(all(any(windows, unix), not(target_vendor = "apple")))'.dependencies.wgpu-hal]
version = "26.0.0"
--- cargo-crates/wgpu-hal-26.0.4/src/vulkan/adapter.rs.orig 2006-07-24 01:21:28 UTC
+++ cargo-crates/wgpu-hal-26.0.4/src/vulkan/adapter.rs
@@ -1170,7 +1170,7 @@ impl PhysicalDeviceProperties {
// Prevent very large buffers on mesa and most android devices.
let is_nvidia = self.properties.vendor_id == crate::auxil::db::nvidia::VENDOR;
let max_buffer_size =
- if (cfg!(target_os = "linux") || cfg!(target_os = "android")) && !is_nvidia {
+ if (cfg!(all(unix, not(target_vendor = "apple")))) && !is_nvidia {
i32::MAX as u64
} else {
u64::MAX
--- cargo-crates/wgpu-hal-26.0.4/src/vulkan/instance.rs.orig 2006-07-24 01:21:28 UTC
+++ cargo-crates/wgpu-hal-26.0.4/src/vulkan/instance.rs
@@ -986,7 +986,7 @@ impl crate::Instance for super::Instance {
exposed.info.device_type == wgt::DeviceType::DiscreteGpu
&& exposed.info.vendor == db::nvidia::VENDOR
});
- if cfg!(target_os = "linux") && has_nvidia_dgpu && self.shared.has_nv_optimus {
+ if cfg!(unix) && has_nvidia_dgpu && self.shared.has_nv_optimus {
for exposed in exposed_adapters.iter_mut() {
if exposed.info.device_type == wgt::DeviceType::IntegratedGpu
&& exposed.info.vendor == db::intel::VENDOR
--- server-cli/src/main.rs.orig 2024-02-14 21:58:23 UTC
+++ server-cli/src/main.rs
@@ -66,14 +66,14 @@ fn main() -> io::Result<()> {
// Load settings
let settings = settings::Settings::load();
- #[cfg(any(target_os = "linux", target_os = "macos"))]
+ #[cfg(not(target_os = "windows"))]
{
for signal in &settings.shutdown_signals {
let _ = signal_hook::flag::register(signal.to_signal(), Arc::clone(&shutdown_signal));
}
}
- #[cfg(not(any(target_os = "linux", target_os = "macos")))]
+ #[cfg(target_os = "windows")]
if !settings.shutdown_signals.is_empty() {
tracing::warn!(
"Server configuration contains shutdown signals, but your platform does not support \
--- server-cli/src/settings.rs.orig 2024-03-20 22:12:47 UTC
+++ server-cli/src/settings.rs
@@ -15,7 +15,7 @@ impl ShutdownSignal {
}
impl ShutdownSignal {
- #[cfg(any(target_os = "linux", target_os = "macos"))]
+ #[cfg(not(target_os = "windows"))]
pub fn to_signal(self) -> core::ffi::c_int {
match self {
Self::SIGUSR1 => signal_hook::consts::SIGUSR1,
@@ -48,7 +48,7 @@ impl Default for Settings {
web_address: SocketAddr::from((Ipv4Addr::LOCALHOST, 14005)),
web_chat_secret: None,
ui_api_secret: None,
- shutdown_signals: if cfg!(any(target_os = "linux", target_os = "macos")) {
+ shutdown_signals: if cfg!(not(target_os = "windows")) {
vec![ShutdownSignal::SIGUSR1]
} else {
Vec::new()
--- voxygen/src/main.rs.orig 2024-02-07 19:13:27 UTC
+++ voxygen/src/main.rs
@@ -51,7 +51,7 @@ fn main() {
cli::Commands::ListWgpuBackends => {
#[cfg(target_os = "windows")]
let backends = &["opengl", "dx12", "vulkan"];
- #[cfg(target_os = "linux")]
+ #[cfg(not(any(target_os = "windows", target_os = "macos")))]
let backends = &["opengl", "vulkan"];
#[cfg(target_os = "macos")]
let backends = &["metal"];
|
