Merge pull request #8 from Motphys/upgrade-to-unity-6

Upgrade Unity headers to 6000.0.5f1, add `IUnityMemoryManager.h`, `IUnityEventQueue.h` and `IUnityLog.h` to generated bindings

Author: aosoft

unity-native-plugin-sys/README.md

@@ -1,7 +1,7 @@
 unity-native-plugin-rs
 ====
 
-* based on Unity 2020.3.13f1
-* Vulkan SDK 1.2.182.0
-* bindgen 0.58.1
+* based on Unity 6000.0.5f1
+* Vulkan SDK 1.3.268.1
+* bindgen 0.69.4
 * clang version 10.0.0-4ubuntu1

unity-native-plugin-sys/src/plugin_api.rs

@@ -2,6 +2,7 @@
 #include <cstddef>
 
 #define UINT32 uint32_t
+#define UINT uint32_t
 
 #include <IUnityGraphics.h>
 #include <IUnityInterface.h>
@@ -10,6 +11,7 @@ struct ID3D11Device {};
 struct ID3D11Resource {};
 struct ID3D11RenderTargetView {};
 struct ID3D11ShaderResourceView {};
+struct IDXGISwapChain {};
 #include <IUnityGraphicsD3D11.h>
 
 typedef std::int32_t D3D12_RESOURCE_STATES;
@@ -32,3 +34,8 @@ struct ID3D12CommandQueue {};
 
 #include <IUnityProfiler.h>
 #include <IUnityProfilerCallbacks.h>
+
+#include <IUnityMemoryManager.h>
+Assert(bool);
+#include <IUnityEventQueue.h>
+#include <IUnityLog.h>

unity-native-plugin-sys/wrapper.hpp

@@ -98,6 +98,9 @@ impl TesterContextGraphicsD3D11 {
                         TextureFromNativeTexture: Some(texture_from_native_texture),
                         RTVFromRenderBuffer: Some(rtv_from_render_buffer),
                         SRVFromNativeTexture: Some(srv_from_native_texture),
+                        GetSwapChain: Some(get_swap_chain),
+                        GetSyncInterval: Some(get_sync_interval),
+                        GetPresentFlags: Some(get_present_flags),
                     },
                     srvs_native_texture: std::collections::HashMap::new(),
                 })
@@ -184,7 +187,8 @@ impl crate::interface::UnityInterfaceBase for TesterContextGraphicsD3D11 {
     }
 
     fn get_unity_interface(&self) -> *mut IUnityInterface {
-        unsafe { std::mem::transmute::<_, _>(&self.interfaces) }
+        &self.interfaces as *const unity_native_plugin_sys::IUnityGraphicsD3D11
+            as *mut unity_native_plugin_sys::IUnityInterface
     }
 }
 
@@ -254,6 +258,22 @@ extern "system" fn srv_from_native_texture(
     }
 }
 
+extern "system" fn get_swap_chain() -> *mut IDXGISwapChain {
+    unsafe {
+        crate::interface::get_unity_interface::<TesterContextGraphicsD3D11>()
+            .swap_chain()
+            .as_raw() as _
+    }
+}
+
+extern "system" fn get_sync_interval() -> u32 {
+    1
+}
+
+extern "system" fn get_present_flags() -> u32 {
+    0
+}
+
 /// Running tests for D3D11.
 ///
 /// * 'TestContextGraphicsD3D11' manages the resources used for testing.

unity-native-plugin-tester/src/d3d11.rs

@@ -12,6 +12,7 @@ pub enum ProfilerMarkerFlag {
     VerbosityAdvanced = UnityProfilerMarkerFlag__kUnityProfilerMarkerFlagVerbosityAdvanced as u16,
 }
 
+#[allow(dead_code)]
 pub struct ProfilerMarkerFlags(u16);
 
 #[repr(u8)]
@@ -194,8 +195,8 @@ pub enum RenderingExtTextureFormat {
     D24_UNorm = UnityRenderingExtTextureFormat_kUnityRenderingExtFormatD24_UNorm,
     D24_UNorm_S8_UInt = UnityRenderingExtTextureFormat_kUnityRenderingExtFormatD24_UNorm_S8_UInt,
     D32_SFloat = UnityRenderingExtTextureFormat_kUnityRenderingExtFormatD32_SFloat,
-    D32_SFloat_S8_Uint = UnityRenderingExtTextureFormat_kUnityRenderingExtFormatD32_SFloat_S8_Uint,
-    S8_Uint = UnityRenderingExtTextureFormat_kUnityRenderingExtFormatS8_Uint,
+    D32_SFloat_S8_UInt = UnityRenderingExtTextureFormat_kUnityRenderingExtFormatD32_SFloat_S8_UInt,
+    S8_UInt = UnityRenderingExtTextureFormat_kUnityRenderingExtFormatS8_UInt,
     RGBA_DXT1_SRGB = UnityRenderingExtTextureFormat_kUnityRenderingExtFormatRGBA_DXT1_SRGB,
     RGBA_DXT1_UNorm = UnityRenderingExtTextureFormat_kUnityRenderingExtFormatRGBA_DXT1_UNorm,
     RGBA_DXT3_SRGB = UnityRenderingExtTextureFormat_kUnityRenderingExtFormatRGBA_DXT3_SRGB,
@@ -254,9 +255,6 @@ pub enum RenderingExtTextureFormat {
     RGBA_ASTC12X12_UNorm =
         UnityRenderingExtTextureFormat_kUnityRenderingExtFormatRGBA_ASTC12X12_UNorm,
     YUV2 = UnityRenderingExtTextureFormat_kUnityRenderingExtFormatYUV2,
-    DepthAuto = UnityRenderingExtTextureFormat_kUnityRenderingExtFormatDepthAuto,
-    ShadowAuto = UnityRenderingExtTextureFormat_kUnityRenderingExtFormatShadowAuto,
-    VideoAuto = UnityRenderingExtTextureFormat_kUnityRenderingExtFormatVideoAuto,
     RGBA_ASTC4X4_UFloat =
         UnityRenderingExtTextureFormat_kUnityRenderingExtFormatRGBA_ASTC4X4_UFloat,
     RGBA_ASTC5X5_UFloat =
@@ -280,7 +278,6 @@ pub enum ShaderCompilerExtCompilerPlatform {
     Unused2 = UnityShaderCompilerExtCompilerPlatform_kUnityShaderCompilerExtCompPlatformUnused2,
     Unused3 = UnityShaderCompilerExtCompilerPlatform_kUnityShaderCompilerExtCompPlatformUnused3,
     D3D11 = UnityShaderCompilerExtCompilerPlatform_kUnityShaderCompilerExtCompPlatformD3D11,
-    GLES20 = UnityShaderCompilerExtCompilerPlatform_kUnityShaderCompilerExtCompPlatformGLES20,
     Unused6 = UnityShaderCompilerExtCompilerPlatform_kUnityShaderCompilerExtCompPlatformUnused6,
     Unused7 = UnityShaderCompilerExtCompilerPlatform_kUnityShaderCompilerExtCompPlatformUnused7,
     Unused8 = UnityShaderCompilerExtCompilerPlatform_kUnityShaderCompilerExtCompPlatformUnused8,

unity-native-plugin/src/enums.rs

@@ -12,7 +12,6 @@ pub type RenderingEventAndData = unity_native_plugin_sys::UnityRenderingEventAnd
 pub enum GfxRenderer {
     D3D11 = UnityGfxRenderer_kUnityGfxRendererD3D11,
     Null = UnityGfxRenderer_kUnityGfxRendererNull,
-    OpenGLES20 = UnityGfxRenderer_kUnityGfxRendererOpenGLES20,
     OpenGLES30 = UnityGfxRenderer_kUnityGfxRendererOpenGLES30,
     PS4 = UnityGfxRenderer_kUnityGfxRendererPS4,
     XboxOne = UnityGfxRenderer_kUnityGfxRendererXboxOne,

unity-native-plugin/src/graphics.rs

@@ -58,7 +58,7 @@ pub enum ProfilerMarkerFlag {
     AvailabilityEditor = UnityProfilerMarkerFlag__kUnityProfilerMarkerFlagAvailabilityEditor as u16,
     AvailabilityNonDev = UnityProfilerMarkerFlag__kUnityProfilerMarkerFlagAvailabilityNonDev as u16,
     Warning = UnityProfilerMarkerFlag__kUnityProfilerMarkerFlagWarning as u16,
-    Counter = UnityProfilerMarkerFlag__kCounter as u16,
+    Counter = UnityProfilerMarkerFlag__kUnityProfilerMarkerFlagCounter as u16,
     VerbosityDebug = UnityProfilerMarkerFlag__kUnityProfilerMarkerFlagVerbosityDebug as u16,
     VerbosityInternal = UnityProfilerMarkerFlag__kUnityProfilerMarkerFlagVerbosityInternal as u16,
     VerbosityAdvanced = UnityProfilerMarkerFlag__kUnityProfilerMarkerFlagVerbosityAdvanced as u16,