Merge pull request #4 from vvvv/master

Error-handling for loading and support for non-4channel images
vvvv · Sep 23, 2024 · 5813fc4 · 5813fc4
2 parents ccae16e + 888fa1a
commit 5813fc4
Show file tree

Hide file tree

Showing 9 changed files with 200 additions and 128 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ Cargo.lock
 # VL Assembly
 VL*.dll
 !VL.OpenEXR.dll
+!VL.OpenEXR.Native.dll
 
 # stride assembly
 Stride*.dll
diff --git a/lib/net8.0/VL.OpenEXR.dll b/lib/net8.0/VL.OpenEXR.dll
diff --git a/resources/0270_Ocean_Commission_Canyon_NLD_11.Depth.0001.exr b/resources/0270_Ocean_Commission_Canyon_NLD_11.Depth.0001.exr
diff --git a/runtimes/win-x64/native/VL.OpenEXR.Native.dll b/runtimes/win-x64/native/VL.OpenEXR.Native.dll
diff --git a/src/VL.OpenEXR.cs b/src/VL.OpenEXR.cs
@@ -10,7 +10,6 @@ enum ExrPixelFormat
         U32 = 0,
         F16 = 1,
         F32 = 2,
-        RGBF32 = 3
     }
 
     public enum ExrEncoding {
@@ -27,13 +26,19 @@ public static class ExrLoader
         [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
 
         [DllImport("VL.OpenEXR.Native.dll")]
-        static extern IntPtr load_from_path(string path, out int width, out int height, out ExrPixelFormat format);
+        static extern Int32 load_from_path(string path, out int width, out int height, out int num_channels, out ExrPixelFormat format, out IntPtr data);
 
         public static Texture LoadFromPath(string path, GraphicsDevice device)
         {
             ExrPixelFormat exrFormat;
             PixelFormat format;
-            IntPtr ptr = load_from_path(path, out var width, out var height, out exrFormat);
+            IntPtr ptr;
+            var result = load_from_path(path, out var width, out var height, out var numChannels, out exrFormat, out ptr);
+
+            if(result != 0) {
+                format = PixelFormat.None;
+                return null;
+            }
 
             if(exrFormat == ExrPixelFormat.Unknown || ptr == IntPtr.Zero)
             {
@@ -42,17 +47,26 @@ public static Texture LoadFromPath(string path, GraphicsDevice device)
             }
 
             int sizeInBytes = 0;
-            bool hasAlpha = true;
-            (format, sizeInBytes, hasAlpha) = exrFormat switch
+            (format, sizeInBytes) = (exrFormat, numChannels) switch
             {
-                ExrPixelFormat.F16 => (PixelFormat.R16G16B16A16_Float, 2, true),
-                ExrPixelFormat.F32 => (PixelFormat.R32G32B32A32_Float, 4, true),
-                ExrPixelFormat.U32 => (PixelFormat.R32G32B32A32_UInt , 4, true),
-                ExrPixelFormat.RGBF32 => (PixelFormat.R32G32B32_Float, 4, false),
-                _ => (PixelFormat.None, 0, false),
+                (ExrPixelFormat.F16, 4) => (PixelFormat.R16G16B16A16_Float, 2),
+                (ExrPixelFormat.F32, 4) => (PixelFormat.R32G32B32A32_Float, 4),
+                (ExrPixelFormat.U32, 4) => (PixelFormat.R32G32B32A32_UInt , 4),
+
+                (ExrPixelFormat.F32, 3) => (PixelFormat.R32G32B32_Float, 4),
+                (ExrPixelFormat.U32, 3) => (PixelFormat.R32G32B32_UInt , 4),
+
+                (ExrPixelFormat.F16, 2) => (PixelFormat.R16G16_Float, 2),
+                (ExrPixelFormat.F32, 2) => (PixelFormat.R32G32_Float, 4),
+                (ExrPixelFormat.U32, 2) => (PixelFormat.R32G32_UInt , 4),
+
+                (ExrPixelFormat.F16, 1) => (PixelFormat.R16_Float, 2),
+                (ExrPixelFormat.F32, 1) => (PixelFormat.R32_Float, 4),
+                (ExrPixelFormat.U32, 1) => (PixelFormat.R32_UInt , 4),
+                _ => (PixelFormat.None, 0),
             };
 
-            var rowPitch = width * (hasAlpha ? 4 : 3) * sizeInBytes;
+            var rowPitch = width * numChannels * sizeInBytes;
 
             var texture = Texture.New(
                 device,
@@ -73,9 +87,9 @@ public static unsafe class ExrWriter
         [DllImport("VL.OpenEXR.Native.dll")]
         static extern int write_texture(string path, int width, int height, ExrPixelFormat format, ExrEncoding encoding, IntPtr data);
 
-        public static int WriteTexture(byte[] data, string path, int width, int height, PixelFormat format, ExrEncoding encoding)
-        {
-            return WriteTexture((ReadOnlySpan<byte>)data, path, width, height, format, encoding);
+        public static int WriteTexture(byte[] data, string path, int width, int height, PixelFormat format, ExrEncoding encoding)
+        {
+            return WriteTexture((ReadOnlySpan<byte>)data, path, width, height, format, encoding);
         }
 
         public static int WriteTexture(ReadOnlySpan<byte> data, string path, int width, int height, PixelFormat format, ExrEncoding encoding)
@@ -90,9 +104,9 @@ public static int WriteTexture(ReadOnlySpan<byte> data, string path, int width,
 
             if(exrFormat == ExrPixelFormat.Unknown) return 1; //return with error
 
-            fixed (byte* pointer = data)
-            {
-                return write_texture(path, width, height, exrFormat, encoding, new IntPtr(pointer));
+            fixed (byte* pointer = data)
+            {
+                return write_texture(path, width, height, exrFormat, encoding, new IntPtr(pointer));
             }
         }
     }

diff --git a/src/build.sh b/src/build.sh
@@ -2,9 +2,9 @@ echo "\033[32mbuild native plugins\033[m"
 cd `dirname $0`
 cd native
 cargo build --target x86_64-pc-windows-gnu --release
-cp target/x86_64-pc-windows-gnu/release/vl_openexr_native.dll ../../lib/native/VL.OpenEXR.Native.dll
+cp target/x86_64-pc-windows-gnu/release/vl_openexr_native.dll ../../runtimes/win-x64/native/VL.OpenEXR.Native.dll
 echo ""
 
 echo "\033[32mbuild managed plugins\033[m"
 cd ../
-dotnet.exe build -c release -o ../lib/netstandard2.0
+dotnet.exe build -c release
diff --git a/src/native/.cargo/config.toml b/src/native/.cargo/config.toml
diff --git a/src/native/Cargo.toml b/src/native/Cargo.toml
@@ -9,6 +9,7 @@ name = "vl_openexr_native"
 crate-type = ["cdylib"]
 
 [dependencies]
+anyhow = { version = "1.0.86", features = ["backtrace"] }
 exr = "1.72.0"
 radiant = "0.3.0"