Do not build xcb parts on OSX

diff --git a/vulkan-driver/src/api.rs b/vulkan-driver/src/api.rs
index e2d6c13ab742c946e769398ae949c6e09f53fb61..6bc5306a4c46be3406abcf16dc12e409b494b098 100644 (file)
--- a/vulkan-driver/src/api.rs
+++ b/vulkan-driver/src/api.rs
@@ -15,7 +15,7 @@ pub use handle::{
     VkSamplerYcbcrConversion, VkSemaphore, VkShaderModule, VkSurfaceKHR, VkSwapchainKHR,
     VkValidationCacheEXT,
 };
-#[cfg(unix)]
+#[cfg(target_os = "linux")]
 use xcb::ffi::{xcb_connection_t, xcb_visualid_t, xcb_window_t};
 include!(concat!(env!("OUT_DIR"), "/vulkan-types.rs"));
 

diff --git a/vulkan-driver/src/api_impl.rs b/vulkan-driver/src/api_impl.rs
index 63e3ac652e6956e9658fd9edc7b5430d428e0139..dc7fc4f1d369213ba13f3ce231aee357dba53cdb 100644 (file)
--- a/vulkan-driver/src/api_impl.rs
+++ b/vulkan-driver/src/api_impl.rs
@@ -28,19 +28,19 @@ use std::ops::*;
 use std::os::raw::{c_char, c_void};
 use std::ptr::null;
 use std::ptr::null_mut;
-#[cfg(unix)]
+#[cfg(target_os = "linux")]
 use std::ptr::NonNull;
 use std::slice;
 use std::str::FromStr;
 use swapchain::SurfacePlatform;
 use sys_info;
 use uuid;
-#[cfg(unix)]
+#[cfg(target_os = "linux")]
 use xcb;
 
 /// structure types the driver should know about
 fn is_supported_structure_type(v: api::VkStructureType) -> bool {
-    #[cfg(unix)]
+    #[cfg(target_os = "linux")]
     {
         #[cfg_attr(feature = "cargo-clippy", allow(clippy::single_match))]
         match v {
@@ -305,7 +305,7 @@ pub enum Extension {
     VK_KHR_shader_draw_parameters,
     VK_KHR_variable_pointers,
     VK_KHR_swapchain,
-    #[cfg(unix)]
+    #[cfg(target_os = "linux")]
     VK_KHR_xcb_surface,
 }
 
@@ -369,7 +369,7 @@ impl Extension {
                 extensions![Extension::VK_KHR_external_semaphore_capabilities]
             }
             Extension::VK_KHR_swapchain => extensions![Extension::VK_KHR_surface],
-            #[cfg(unix)]
+            #[cfg(target_os = "linux")]
             Extension::VK_KHR_xcb_surface => extensions![Extension::VK_KHR_surface],
         }
     }
@@ -425,7 +425,7 @@ impl Extension {
             VK_KHR_shader_draw_parameters,
             VK_KHR_variable_pointers,
             VK_KHR_swapchain,
-            #[cfg(unix)]
+            #[cfg(target_os = "linux")]
             VK_KHR_xcb_surface,
         )
     }
@@ -476,7 +476,7 @@ impl Extension {
             }
             Extension::VK_KHR_variable_pointers => api::VK_KHR_VARIABLE_POINTERS_SPEC_VERSION,
             Extension::VK_KHR_swapchain => api::VK_KHR_SWAPCHAIN_SPEC_VERSION,
-            #[cfg(unix)]
+            #[cfg(target_os = "linux")]
             Extension::VK_KHR_xcb_surface => api::VK_KHR_XCB_SURFACE_SPEC_VERSION,
         }
     }
@@ -515,7 +515,7 @@ impl Extension {
             | Extension::VK_KHR_shader_draw_parameters
             | Extension::VK_KHR_variable_pointers
             | Extension::VK_KHR_swapchain => ExtensionScope::Device,
-            #[cfg(unix)]
+            #[cfg(target_os = "linux")]
             Extension::VK_KHR_xcb_surface => ExtensionScope::Instance,
         }
     }
@@ -985,9 +985,9 @@ fn get_proc_address(
         proc_address!(vkGetPhysicalDevicePresentRectanglesKHR, PFN_vkGetPhysicalDevicePresentRectanglesKHR, device, extensions[Extension::VK_KHR_swapchain]);
         proc_address!(vkAcquireNextImage2KHR, PFN_vkAcquireNextImage2KHR, device, extensions[Extension::VK_KHR_swapchain]);
 
-        #[cfg(unix)]
+        #[cfg(target_os = "linux")]
         proc_address!(vkCreateXcbSurfaceKHR, PFN_vkCreateXcbSurfaceKHR, device, extensions[Extension::VK_KHR_xcb_surface]);
-        #[cfg(unix)]
+        #[cfg(target_os = "linux")]
         proc_address!(vkGetPhysicalDeviceXcbPresentationSupportKHR, PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR, device, extensions[Extension::VK_KHR_xcb_surface]);
         /*
         proc_address!(vkCmdBeginConditionalRenderingEXT, PFN_vkCmdBeginConditionalRenderingEXT, device, unknown);
@@ -6624,7 +6624,7 @@ pub unsafe extern "system" fn vkGetQueueCheckpointDataNV(
     unimplemented!()
 }
 
-#[cfg(unix)]
+#[cfg(target_os = "linux")]
 #[allow(non_snake_case)]
 pub unsafe extern "system" fn vkCreateXcbSurfaceKHR(
     _instance: api::VkInstance,
@@ -6650,7 +6650,7 @@ pub unsafe extern "system" fn vkCreateXcbSurfaceKHR(
     api::VK_SUCCESS
 }
 
-#[cfg(unix)]
+#[cfg(target_os = "linux")]
 #[allow(non_snake_case)]
 pub unsafe extern "system" fn vkGetPhysicalDeviceXcbPresentationSupportKHR(
     _physicalDevice: api::VkPhysicalDevice,

diff --git a/vulkan-driver/src/lib.rs b/vulkan-driver/src/lib.rs
index 8f297d98e2e561662e0501f9313e1d21b5f8c5fd..0879956be47a493d458a1c325f0a363f7cb6f2af 100644 (file)
--- a/vulkan-driver/src/lib.rs
+++ b/vulkan-driver/src/lib.rs
@@ -3,14 +3,14 @@
 #![cfg_attr(feature = "cargo-clippy", allow(clippy::new_ret_no_self))]
 #[macro_use]
 extern crate enum_map;
-#[cfg(unix)]
+#[cfg(target_os = "linux")]
 extern crate errno;
-#[cfg(unix)]
+#[cfg(target_os = "linux")]
 extern crate libc;
 extern crate shader_compiler_backend;
 extern crate sys_info;
 extern crate uuid;
-#[cfg(unix)]
+#[cfg(target_os = "linux")]
 extern crate xcb;
 mod api;
 mod api_impl;
@@ -20,10 +20,10 @@ mod handle;
 mod image;
 mod sampler;
 mod shader_module;
-#[cfg(unix)]
+#[cfg(target_os = "linux")]
 mod shm;
 mod swapchain;
-#[cfg(unix)]
+#[cfg(target_os = "linux")]
 mod xcb_swapchain;
 use std::ffi::CStr;
 use std::os::raw::c_char;

diff --git a/vulkan-driver/src/swapchain.rs b/vulkan-driver/src/swapchain.rs
index 7b8d531f6fd08c9e9471e74b0df9e511ae1bac91..4221a313735ccc1beb8b0fbd0f777c0e91c117b4 100644 (file)
--- a/vulkan-driver/src/swapchain.rs
+++ b/vulkan-driver/src/swapchain.rs
@@ -6,7 +6,7 @@ use std::borrow::Cow;
 use std::error::Error;
 use std::fmt::{self, Debug};
 use std::ptr::NonNull;
-#[cfg(unix)]
+#[cfg(target_os = "linux")]
 use xcb_swapchain::XcbSurfaceImplementation;
 
 #[derive(Copy, Clone, Eq, PartialEq, Hash, Debug, Enum)]
@@ -50,10 +50,10 @@ impl SurfacePlatform {
         }
     }
     pub fn get_surface_implementation(self) -> Cow<'static, dyn SurfaceImplementation> {
-        #[cfg(unix)]
+        #[cfg(target_os = "linux")]
         const XCB_SURFACE_IMPLEMENTATION: XcbSurfaceImplementation = XcbSurfaceImplementation;
         match self {
-            #[cfg(unix)]
+            #[cfg(target_os = "linux")]
             SurfacePlatform::VK_ICD_WSI_PLATFORM_XCB => Cow::Borrowed(&XCB_SURFACE_IMPLEMENTATION),
             _ => Cow::Owned(FallbackSurfaceImplementation(self).duplicate()),
         }