From 1ad646c07cab3ffa17d8975d72db1b8e41e8ac89 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Wed, 12 Jul 2023 23:52:12 +0200 Subject: [PATCH] narcissus-gpu: Move libc module into its own file --- libs/narcissus-gpu/src/backend/vulkan/libc.rs | 9 +++++++++ libs/narcissus-gpu/src/backend/vulkan/mod.rs | 13 +------------ 2 files changed, 10 insertions(+), 12 deletions(-) create mode 100644 libs/narcissus-gpu/src/backend/vulkan/libc.rs diff --git a/libs/narcissus-gpu/src/backend/vulkan/libc.rs b/libs/narcissus-gpu/src/backend/vulkan/libc.rs new file mode 100644 index 0000000..f761ff5 --- /dev/null +++ b/libs/narcissus-gpu/src/backend/vulkan/libc.rs @@ -0,0 +1,9 @@ +use std::os::raw::{c_char, c_int, c_void}; + +pub const RTLD_NOW: c_int = 0x2; +pub const RTLD_LOCAL: c_int = 0; + +extern "C" { + pub fn dlopen(filename: *const c_char, flag: c_int) -> *mut c_void; + pub fn dlsym(handle: *mut c_void, symbol: *const c_char) -> *mut c_void; +} diff --git a/libs/narcissus-gpu/src/backend/vulkan/mod.rs b/libs/narcissus-gpu/src/backend/vulkan/mod.rs index 3822310..3a28441 100644 --- a/libs/narcissus-gpu/src/backend/vulkan/mod.rs +++ b/libs/narcissus-gpu/src/backend/vulkan/mod.rs @@ -29,6 +29,7 @@ use crate::{ SwapchainOutOfDateError, ThreadToken, Topology, TransientBuffer, TypedBind, }; +mod libc; mod wsi; use self::wsi::{VulkanWsi, VulkanWsiFrame}; @@ -52,18 +53,6 @@ const VULKAN_CONSTANTS: VulkanConstants = VulkanConstants { transient_buffer_max_align: 256, }; -mod libc { - use std::os::raw::{c_char, c_int, c_void}; - - pub const RTLD_NOW: c_int = 0x2; - pub const RTLD_LOCAL: c_int = 0; - - extern "C" { - pub fn dlopen(filename: *const c_char, flag: c_int) -> *mut c_void; - pub fn dlsym(handle: *mut c_void, symbol: *const c_char) -> *mut c_void; - } -} - #[macro_export] macro_rules! vk_check { ($e:expr) => ({ -- 2.49.0