Merge pull request #9 from aosoft/aosoft/#7

aosoft · web-flow · commit 4ce1d58b62fd · 2024-07-16T08:58:04.000+09:00
Add new interfaces
diff --git a/unity-native-plugin-sample-profiler/Cargo.toml b/unity-native-plugin-sample-profiler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unity-native-plugin-sample-profiler"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Yasuhiro Taniuchi"]
 edition = "2018"
 publish = false
@@ -11,8 +11,8 @@ crate-type = ["cdylib"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-unity-native-plugin = { version = "0.5.0",  path = "../unity-native-plugin", features = ["profiler_callbacks"] }
-unity-native-plugin-sys = { version = "0.5.0", path = "../unity-native-plugin-sys" }
+unity-native-plugin = { version = "0.6.0",  path = "../unity-native-plugin", features = ["profiler_callbacks"] }
+unity-native-plugin-sys = { version = "0.6.0", path = "../unity-native-plugin-sys" }
 log = "0.4"
 env_logger = "0.8"
 flume = "0.10"
diff --git a/unity-native-plugin-sample/Cargo.toml b/unity-native-plugin-sample/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unity-native-plugin-sample"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Yasuhiro Taniuchi"]
 edition = "2018"
 publish = false
@@ -11,10 +11,10 @@ crate-type = ["cdylib"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-unity-native-plugin = { version = "0.5.0",  path = "../unity-native-plugin", features = ["d3d11", "d3d12", "profiler"] }
-unity-native-plugin-vulkan = { version = "0.5.0",  path = "../unity-native-plugin-vulkan" }
+unity-native-plugin = { version = "0.6.0",  path = "../unity-native-plugin", features = ["d3d11", "d3d12", "profiler"] }
+unity-native-plugin-vulkan = { version = "0.6.0",  path = "../unity-native-plugin-vulkan" }
 winapi = { version = "0.3.9", features = ["winuser", "d3d11", "dxgiformat"] }
 wio = "0.2.2"
 
 [dev-dependencies]
-unity-native-plugin-tester = { version = "0.5.0",  path = "../unity-native-plugin-tester", features = ["d3d11"] }
+unity-native-plugin-tester = { version = "0.6.0",  path = "../unity-native-plugin-tester", features = ["d3d11"] }
diff --git a/unity-native-plugin-sys/Cargo.toml b/unity-native-plugin-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unity-native-plugin-sys"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Yasuhiro Taniuchi"]
 edition = "2018"
 license = "MIT"
diff --git a/unity-native-plugin-sys/README.md b/unity-native-plugin-sys/README.md
@@ -1,7 +1,7 @@
 unity-native-plugin-rs
 ====
 
-* based on Unity 6000.0.5f1
-* Vulkan SDK 1.3.268.1
+* based on Unity 6000.0.10f1
+* Vulkan SDK 1.3.283.0
 * bindgen 0.69.4
-* clang version 10.0.0-4ubuntu1
+* clang version 14.0.0-1ubuntu1.1
diff --git a/unity-native-plugin-sys/src/plugin_api.rs b/unity-native-plugin-sys/src/plugin_api.rs
diff --git a/unity-native-plugin-sys/wrapper.hpp b/unity-native-plugin-sys/wrapper.hpp
@@ -36,6 +36,8 @@ struct ID3D12CommandQueue {};
 #include <IUnityProfilerCallbacks.h>
 
 #include <IUnityMemoryManager.h>
-Assert(bool);
+
+#define Assert(x)
+
 #include <IUnityEventQueue.h>
 #include <IUnityLog.h>
diff --git a/unity-native-plugin-tester/Cargo.toml b/unity-native-plugin-tester/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unity-native-plugin-tester"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Yasuhiro Taniuchi"]
 edition = "2018"
 license = "MIT"
@@ -25,8 +25,8 @@ d3d11 = []
 d3d12 = []
 
 [dependencies]
-unity-native-plugin-sys = { version = "0.5.0", path = "../unity-native-plugin-sys" }
-unity-native-plugin = { version = "0.5.0",  path = "../unity-native-plugin", features = ["d3d11", "d3d12"] }
+unity-native-plugin-sys = { version = "0.6.0", path = "../unity-native-plugin-sys" }
+unity-native-plugin = { version = "0.6.0",  path = "../unity-native-plugin", features = ["d3d11", "d3d12"] }
 winapi = { version = "0.3.9", features = ["winuser", "dxgi", "d3d11", "dxgiformat", "dxgitype", "d3dcommon"] }
 winit = "0.23.0"
 wio = "0.2.2"
diff --git a/unity-native-plugin-vulkan/Cargo.toml b/unity-native-plugin-vulkan/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unity-native-plugin-vulkan"
-version = "0.5.1"
+version = "0.6.0"
 authors = ["Yasuhiro Taniuchi"]
 license = "MIT"
 description = "Unity Native Plugin API (Vulkan) for Rust"
@@ -19,6 +19,6 @@ include = [
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-unity-native-plugin = { version = "0.5.0", path = "../unity-native-plugin" }
-unity-native-plugin-sys = { version = "0.5.0", path = "../unity-native-plugin-sys" }
-ash = "0.33.1"
+unity-native-plugin = { version = "0.6.0", path = "../unity-native-plugin" }
+unity-native-plugin-sys = { version = "0.6.0", path = "../unity-native-plugin-sys" }
+ash = "0.38.0+1.3.281.1"
diff --git a/unity-native-plugin/Cargo.toml b/unity-native-plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unity-native-plugin"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Yasuhiro Taniuchi"]
 license = "MIT"
 description = "Unity Native Plugin API for Rust"
@@ -26,4 +26,4 @@ profiler = []
 profiler_callbacks = ["profiler"]
 
 [dependencies]
-unity-native-plugin-sys = { version = "0.5.0", path = "../unity-native-plugin-sys" }
+unity-native-plugin-sys = { version = "0.6.0", path = "../unity-native-plugin-sys" }
diff --git a/unity-native-plugin/src/d3d11.rs b/unity-native-plugin/src/d3d11.rs
@@ -39,4 +39,24 @@ impl UnityGraphicsD3D11 {
             .SRVFromNativeTexture
             .expect("SRVFromNativeTexture")(texture) as ComPtr
     }
+
+    pub unsafe fn swap_chain(&self) -> ComPtr {
+        self.interface().GetSwapChain.expect("GetSwapChain")() as ComPtr
+    }
+
+    pub fn sync_interval(&self) -> u32 {
+        unsafe {
+            self.interface()
+                .GetSyncInterval
+                .expect("GetSyncInterval")()
+        }
+    }
+
+    pub fn present_flags(&self) -> u32 {
+        unsafe {
+            self.interface()
+                .GetPresentFlags
+                .expect("GetPresentFlags")()
+        }
+    }
 }
diff --git a/unity-native-plugin/src/d3d12.rs b/unity-native-plugin/src/d3d12.rs
@@ -29,7 +29,7 @@ impl UnityGraphicsD3D12 {
         unsafe {
             self.interface()
                 .GetNextFrameFenceValue
-                .expect("GetNextFrameFenceValue")()
+                .expect("GetNextFrameFenceValue")() as u64
         }
     }
 
@@ -79,7 +79,7 @@ impl UnityGraphicsD3D12v2 {
         unsafe {
             self.interface()
                 .GetNextFrameFenceValue
-                .expect("GetNextFrameFenceValue")()
+                .expect("GetNextFrameFenceValue")() as u64
         }
     }
 
@@ -94,7 +94,7 @@ impl UnityGraphicsD3D12v2 {
             command_list as *mut ID3D12GraphicsCommandList,
             states.len() as ::std::os::raw::c_int,
             states.as_ptr() as *mut UnityGraphicsD3D12ResourceState,
-        )
+        ) as u64
     }
 }
 
@@ -120,7 +120,7 @@ impl UnityGraphicsD3D12v3 {
         unsafe {
             self.interface()
                 .GetNextFrameFenceValue
-                .expect("GetNextFrameFenceValue")()
+                .expect("GetNextFrameFenceValue")() as u64
         }
     }
 
@@ -135,7 +135,7 @@ impl UnityGraphicsD3D12v3 {
             command_list as *mut ID3D12GraphicsCommandList,
             states.len() as ::std::os::raw::c_int,
             states.as_ptr() as *mut UnityGraphicsD3D12ResourceState,
-        )
+        ) as u64
     }
 
     pub fn set_physical_video_memory_control_values(
@@ -172,7 +172,7 @@ impl UnityGraphicsD3D12v4 {
         unsafe {
             self.interface()
                 .GetNextFrameFenceValue
-                .expect("GetNextFrameFenceValue")()
+                .expect("GetNextFrameFenceValue")() as u64
         }
     }
 
@@ -187,7 +187,7 @@ impl UnityGraphicsD3D12v4 {
             command_list as *mut ID3D12GraphicsCommandList,
             states.len() as ::std::os::raw::c_int,
             states.as_ptr() as *mut UnityGraphicsD3D12ResourceState,
-        )
+        ) as u64
     }
 
     pub fn set_physical_video_memory_control_values(
@@ -228,7 +228,7 @@ impl UnityGraphicsD3D12v5 {
         unsafe {
             self.interface()
                 .GetNextFrameFenceValue
-                .expect("GetNextFrameFenceValue")()
+                .expect("GetNextFrameFenceValue")() as u64
         }
     }
 
@@ -243,7 +243,7 @@ impl UnityGraphicsD3D12v5 {
             command_list as *mut ID3D12GraphicsCommandList,
             states.len() as ::std::os::raw::c_int,
             states.as_ptr() as *mut UnityGraphicsD3D12ResourceState,
-        )
+        ) as u64
     }
 
     pub fn set_physical_video_memory_control_values(
diff --git a/unity-native-plugin/src/enums.rs b/unity-native-plugin/src/enums.rs
@@ -1,36 +1,5 @@
 use unity_native_plugin_sys::*;
 
-#[repr(u16)]
-#[derive(Copy, Clone, PartialEq, Eq, Debug)]
-pub enum ProfilerMarkerFlag {
-    ScriptEnterLeave = UnityProfilerMarkerFlag__kUnityProfilerMarkerFlagScriptEnterLeave as u16,
-    AvailabilityEditor = UnityProfilerMarkerFlag__kUnityProfilerMarkerFlagAvailabilityEditor as u16,
-    AvailabilityNonDev = UnityProfilerMarkerFlag__kUnityProfilerMarkerFlagAvailabilityNonDev as u16,
-    Warning = UnityProfilerMarkerFlag__kUnityProfilerMarkerFlagWarning as u16,
-    VerbosityDebug = UnityProfilerMarkerFlag__kUnityProfilerMarkerFlagVerbosityDebug as u16,
-    VerbosityInternal = UnityProfilerMarkerFlag__kUnityProfilerMarkerFlagVerbosityInternal as u16,
-    VerbosityAdvanced = UnityProfilerMarkerFlag__kUnityProfilerMarkerFlagVerbosityAdvanced as u16,
-}
-
-#[allow(dead_code)]
-pub struct ProfilerMarkerFlags(u16);
-
-#[repr(u8)]
-#[derive(Copy, Clone, PartialEq, Eq, Debug)]
-pub enum ProfilerMarkerDataType {
-    None = UnityProfilerMarkerDataType__kUnityProfilerMarkerDataTypeNone as u8,
-    InstanceId = UnityProfilerMarkerDataType__kUnityProfilerMarkerDataTypeInstanceId as u8,
-    Int32 = UnityProfilerMarkerDataType__kUnityProfilerMarkerDataTypeInt32 as u8,
-    UInt32 = UnityProfilerMarkerDataType__kUnityProfilerMarkerDataTypeUInt32 as u8,
-    Int64 = UnityProfilerMarkerDataType__kUnityProfilerMarkerDataTypeInt64 as u8,
-    UInt64 = UnityProfilerMarkerDataType__kUnityProfilerMarkerDataTypeUInt64 as u8,
-    Float = UnityProfilerMarkerDataType__kUnityProfilerMarkerDataTypeFloat as u8,
-    Double = UnityProfilerMarkerDataType__kUnityProfilerMarkerDataTypeDouble as u8,
-    String = UnityProfilerMarkerDataType__kUnityProfilerMarkerDataTypeString as u8,
-    String16 = UnityProfilerMarkerDataType__kUnityProfilerMarkerDataTypeString16 as u8,
-    Blob8 = UnityProfilerMarkerDataType__kUnityProfilerMarkerDataTypeBlob8 as u8,
-}
-
 #[repr(u32)]
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub enum RenderingExtEventType {
diff --git a/unity-native-plugin/src/graphics.rs b/unity-native-plugin/src/graphics.rs
@@ -12,6 +12,7 @@ pub type RenderingEventAndData = unity_native_plugin_sys::UnityRenderingEventAnd
 pub enum GfxRenderer {
     D3D11 = UnityGfxRenderer_kUnityGfxRendererD3D11,
     Null = UnityGfxRenderer_kUnityGfxRendererNull,
+    OpenGLES20 = 8, // OpenGL ES 2.0, removed
     OpenGLES30 = UnityGfxRenderer_kUnityGfxRendererOpenGLES30,
     PS4 = UnityGfxRenderer_kUnityGfxRendererPS4,
     XboxOne = UnityGfxRenderer_kUnityGfxRendererXboxOne,
@@ -21,6 +22,11 @@ pub enum GfxRenderer {
     Vulkan = UnityGfxRenderer_kUnityGfxRendererVulkan,
     Nvn = UnityGfxRenderer_kUnityGfxRendererNvn,
     XboxOneD3D12 = UnityGfxRenderer_kUnityGfxRendererXboxOneD3D12,
+    GameCoreXboxOne = UnityGfxRenderer_kUnityGfxRendererGameCoreXboxOne,
+    GameCoreXboxSeries = UnityGfxRenderer_kUnityGfxRendererGameCoreXboxSeries,
+    PS5 = UnityGfxRenderer_kUnityGfxRendererPS5,
+    PS5NGGC = UnityGfxRenderer_kUnityGfxRendererPS5NGGC,
+    ReservedCFE = UnityGfxRenderer_kUnityGfxRendererReservedCFE,
 }
 
 #[repr(u32)]
diff --git a/unity-native-plugin/src/lib.rs b/unity-native-plugin/src/lib.rs
@@ -13,6 +13,9 @@ pub mod profiler_callbacks;
 pub mod enums;
 pub mod graphics;
 pub mod interface;
+pub mod log;
+pub mod memory_manager;
+
 pub type IUnityInterfaces = unity_native_plugin_sys::IUnityInterfaces;
 
 #[macro_export]
diff --git a/unity-native-plugin/src/log.rs b/unity-native-plugin/src/log.rs
@@ -0,0 +1,29 @@
+use crate::define_unity_interface;
+use crate::interface::UnityInterface;
+use std::ffi::CStr;
+use unity_native_plugin_sys::*;
+
+#[repr(u32)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
+pub enum LogType
+{
+    Error = UnityLogType_kUnityLogTypeError,
+    Warning = UnityLogType_kUnityLogTypeWarning,
+    Log = UnityLogType_kUnityLogTypeLog,
+    Exception = UnityLogType_kUnityLogTypeException,
+}
+
+define_unity_interface!(
+    UnityLog,
+    IUnityLog,
+    0x9E7507fA5B444D5D_u64,
+    0x92FB979515EA83FC_u64
+);
+
+impl UnityLog {
+    pub fn log(&self, log_type: LogType, message: &CStr, file_name: &CStr, file_line: i32) {
+        unsafe {
+            self.interface().Log.expect("Log")(log_type as UnityLogType, message.as_ptr(), file_name.as_ptr(), file_line);
+        }
+    }
+}
diff --git a/unity-native-plugin/src/memory_manager.rs b/unity-native-plugin/src/memory_manager.rs
diff --git a/unity-native-plugin/src/profiler.rs b/unity-native-plugin/src/profiler.rs
