a few fix

Author: newDINO

README.md

@@ -9,6 +9,7 @@ Current implementation first copies VkImage inside the swapchain to a VkBuffer,
 #### Programs
 ✅: Works fine.  
 🛠️: Tested, but not functioning well.  
+❌: Tested, but not workding or barely working.
 ⏹️: Untested.
 
 - ✅ xcb hello triangle
@@ -17,14 +18,17 @@ Current implementation first copies VkImage inside the swapchain to a VkBuffer,
 - ✅ vkmark (~900 FPS on SD8Gen3)
 - 🛠️ gears (Only shows the red gear's first face)
 - 🛠️ glmark2 (Can't finish the benchmark, crash in the middle of it, error: `ralloc_header *get_header(const void *): assertion "info->canary == CANARY" failed`. ~350-400 FPS on SD8Gen3)
-- 🛠️ firefox (Only 4 FPS in WebGL Samples Aquarium)
-- 🛠️ chromium (When enabling vulkan flag: in chome://gpu, vulkan info shows it is using xvk_droid, but dawn is using the original vulkan loader)
+- ❌ firefox (Only 4 FPS in WebGL Samples Aquarium)
+- ❌ chromium (When enabling vulkan flag: in chome://gpu, vulkan info shows it is using xvk_droid, but dawn is using the original vulkan loader)
+- ❌ programs inside proot-distro (When compiling using glibc, the program can't load android dynamic library, we need to compile bionic libdl to work)
+- ❌ glibc packages (Same reason as proot-distro programs)
+- ⏹️ box64 wine dxvk (need to fix glibc packages first)
 - ⏹️ Minecraft (Require compiling OpenJFX for termux)
-- ⏹️ box64 wine dxvk
-- ⏹️ wgpu programs (winit is assuming termux an android environment)
+- ⏹️ wgpu programs (winit is assuming termux an android environment and not using x11 surface)
 
 ### TODO
 - Support test programs listed above.
+- Support loading android `libvulkan.so` when compiled using glibc, so that it can be used for glibc-repo programs and proot\chroot gnu linux programs.
 - Provide prebuilt binaries and make it a deb package.
 - Publish to Termux repo.
 - Make it an ICD driver to support coexisting with other vulkan drivers.

c_test/xv.c

@@ -3,6 +3,8 @@
 #define VK_USE_PLATFORM_XCB_KHR
 #include <vulkan/vk_icd.h>
 #include <stdio.h>
+#include <string.h>
+
 // Data need to be freed afterwards.
 void* readBinFile(char* path, long* size) {
     FILE* file = fopen(path, "r");

makefile

@@ -1,4 +1,4 @@
-CC = clang
+CC = gcc
 
 CFLAGS = -Wall -Werror
 TARGET_DIR = target

xvk_droid/src/dlfcn.rs

@@ -19,10 +19,10 @@ unsafe extern "C" {
         __symbol: *const ::std::os::raw::c_char,
     ) -> *mut ::std::os::raw::c_void;
 }
-// unsafe extern "C" {
-//     #[doc = " [dlclose(3)](http://man7.org/linux/man-pages/man3/dlclose.3.html)\n decrements the reference count for the given shared library (and\n any libraries brought in by that library's DT_NEEDED entries).\n\n If a library's reference count hits zero, it may be unloaded.\n Code that relies on this is not portable, and may not work on\n future versions of Android.\n\n dlclose() is dangerous because function pointers may or may not\n be rendered invalid, global data may or may not be rendered invalid,\n and memory may or may not leak. Code with global constructors is\n especially problematic. Instead of dlclose, prefer to leave the\n library open or, if cleanup is necessary, dlopen() the library in\n a child process which can later be killed by the parent or call\n exit() itself.\n\n Note also that dlclose() interacts badly with thread local variables\n with non-trivial destructors, with the\n (exact behavior varying by API level)[https://android.googlesource.com/platform/bionic/+/main/android-changes-for-ndk-developers.md#dlclose-interacts-badly-with-thread-local-variables-with-non_trivial-destructors].\n\n Returns 0 on success, and returns -1 on failure, in which case\n dlerror() can be used to retrieve the specific error."]
-//     pub fn dlclose(__handle: *mut ::std::os::raw::c_void) -> ::std::os::raw::c_int;
-// }
+unsafe extern "C" {
+    #[doc = " [dlclose(3)](http://man7.org/linux/man-pages/man3/dlclose.3.html)\n decrements the reference count for the given shared library (and\n any libraries brought in by that library's DT_NEEDED entries).\n\n If a library's reference count hits zero, it may be unloaded.\n Code that relies on this is not portable, and may not work on\n future versions of Android.\n\n dlclose() is dangerous because function pointers may or may not\n be rendered invalid, global data may or may not be rendered invalid,\n and memory may or may not leak. Code with global constructors is\n especially problematic. Instead of dlclose, prefer to leave the\n library open or, if cleanup is necessary, dlopen() the library in\n a child process which can later be killed by the parent or call\n exit() itself.\n\n Note also that dlclose() interacts badly with thread local variables\n with non-trivial destructors, with the\n (exact behavior varying by API level)[https://android.googlesource.com/platform/bionic/+/main/android-changes-for-ndk-developers.md#dlclose-interacts-badly-with-thread-local-variables-with-non_trivial-destructors].\n\n Returns 0 on success, and returns -1 on failure, in which case\n dlerror() can be used to retrieve the specific error."]
+    pub fn dlclose(__handle: *mut ::std::os::raw::c_void) -> ::std::os::raw::c_int;
+}
 // unsafe extern "C" {
 //     #[doc = " [dlerror(3)](http://man7.org/linux/man-pages/man3/dlerror.3.html)\n returns a human-readable error message describing the most recent\n failure from one of the <dlfcn.h> functions on the calling thread.\n\n This function also clears the error, so a second call (or a call\n before any failure) will return NULL.\n\n Returns a pointer to an error on success, and returns NULL if no\n error is pending."]
 //     pub fn dlerror() -> *mut ::std::os::raw::c_char;

xvk_droid/src/lib.rs

@@ -1,6 +1,6 @@
-use std::ffi::CStr;
+use std::{ffi::{c_void, CStr}, ptr::null_mut};
 
-use dlfcn::{dlopen, RTLD_NOW};
+use dlfcn::{dlclose, dlopen, RTLD_NOW};
 mod dlfcn;
 
 // All original function pointers.
@@ -19,12 +19,19 @@ const SO_PATH: &CStr = c"/system/lib64/libvulkan.so";
 // const SO_PATH: &CStr = c"/data/data/com.termux/files/usr/lib/libvulkan.so";
 // const SO_PATH: &CStr = c"/data/data/com.termux/files/usr/lib/libvk_swiftshader.so";
 
+static mut HANDLE: *mut c_void = null_mut();
+
 // Initiations
 #[ctor::ctor]
 unsafe fn init_xvk() {
     println!("XVK_DROID loaded");
-    let handle = dlopen(SO_PATH.as_ptr(), RTLD_NOW as i32);
+    HANDLE = dlopen(SO_PATH.as_ptr(), RTLD_NOW as i32);
     // let get_pfn = dlsym(handle, c"vkGetInstanceProcAddr".as_ptr());
-    init::init(handle);
+    init::init(HANDLE);
     export::init();
 }
+
+#[ctor::dtor]
+unsafe fn fini_xvk() {
+    dlclose(HANDLE);
+}