From 5deada8426cd0b556ebdaa751096930c2220e906 Mon Sep 17 00:00:00 2001
From: Andrzej Janik <vosen@vosen.pl>
Date: Thu, 24 Jul 2025 02:33:59 +0200
Subject: [PATCH] Add cuCtxCreate_v2 and cuCtxDestroy_v2 (#430)

---
 zluda/src/impl/context.rs | 42 +++++++++++++++++++++++----------------
 zluda/src/lib.rs          |  2 ++
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/zluda/src/impl/context.rs b/zluda/src/impl/context.rs
index 1b7929e..7461880 100644
--- a/zluda/src/impl/context.rs
+++ b/zluda/src/impl/context.rs
@@ -1,9 +1,8 @@
-use super::{FromCuda, ZludaObject, module};
+use super::{module, FromCuda, ZludaObject};
 use cuda_types::cuda::*;
 use hip_runtime_sys::*;
-use rustc_hash::{FxHashSet, FxHashMap};
-use std::{cell::RefCell, ptr, sync::Mutex, ffi::c_void};
-
+use rustc_hash::{FxHashMap, FxHashSet};
+use std::{cell::RefCell, ffi::c_void, ptr, sync::Mutex};
 
 thread_local! {
     pub(crate) static STACK: RefCell<Vec<(CUcontext, hipDevice_t)>> = RefCell::new(Vec::new());
@@ -48,12 +47,11 @@ impl ContextState {
         self.ref_count = 0;
         self.flags = 0;
         // drop all modules and return first error if any
-        let result = self.modules.drain().fold(
-            Ok(()), |res: CUresult, hmod| {
-                match (res, super::drop_checked::<module::Module>(hmod)) {
-                    (Err(e), _) => Err(e),
-                    (_, Err(e)) => Err(e),
-                    _ => Ok(()),
+        let result = self.modules.drain().fold(Ok(()), |res: CUresult, hmod| {
+            match (res, super::drop_checked::<module::Module>(hmod)) {
+                (Err(e), _) => Err(e),
+                (_, Err(e)) => Err(e),
+                _ => Ok(()),
             }
         });
         self.storage.clear();
@@ -69,12 +67,9 @@ impl Context {
         }
     }
 
-    pub(crate) fn with_state(
-        &self,
-        fn_: impl FnOnce(&ContextState) -> CUresult,
-    ) -> CUresult {
+    pub(crate) fn with_state(&self, fn_: impl FnOnce(&ContextState) -> CUresult) -> CUresult {
         match self.state.lock() {
-            Ok(guard) => fn_(& *guard),
+            Ok(guard) => fn_(&*guard),
             Err(_) => CUresult::ERROR_UNKNOWN,
         }
     }
@@ -167,7 +162,6 @@ pub(crate) fn get_device(dev: &mut hipDevice_t) -> CUresult {
     Ok(())
 }
 
-
 pub(crate) unsafe fn push_current(ctx: CUcontext) -> CUresult {
     if ctx == CUcontext(ptr::null_mut()) {
         return CUresult::ERROR_INVALID_VALUE;
@@ -188,6 +182,20 @@ pub(crate) unsafe fn pop_current(ctx: &mut CUcontext) -> CUresult {
     Ok(())
 }
 
+pub(crate) unsafe fn create_v2(
+    ctx: &mut CUcontext,
+    _flags: ::core::ffi::c_uint,
+    dev: cuda_types::cuda::CUdevice,
+) -> CUresult {
+    let handle = Context::wrap(Context::new(dev));
+    *ctx = handle;
+    Ok(())
+}
+
+pub(crate) unsafe fn destroy_v2(ctx: CUcontext) -> CUresult {
+    super::drop_checked::<Context>(ctx)
+}
+
 pub(crate) unsafe fn pop_current_v2(ctx: &mut CUcontext) -> CUresult {
     pop_current(ctx)
-}
\ No newline at end of file
+}
diff --git a/zluda/src/lib.rs b/zluda/src/lib.rs
index 302677d..f589de4 100644
--- a/zluda/src/lib.rs
+++ b/zluda/src/lib.rs
@@ -61,6 +61,8 @@ macro_rules! implemented_in_function {
 cuda_base::cuda_function_declarations!(
     unimplemented,
     implemented <= [
+        cuCtxCreate_v2,
+        cuCtxDestroy_v2,
         cuCtxGetLimit,
         cuCtxSetCurrent,
         cuCtxGetCurrent,