Merge branch 'ascpixi:main' into bit32

ascpixi · Sep 16, 2023 · a5a97da · a5a97da
2 parents c38e983 + 5764b6b
commit a5a97da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/SmolSharp.Ocean/Program.cs b/src/SmolSharp.Ocean/Program.cs
@@ -145,14 +145,14 @@ static unsafe uint RenderThread(nint hwnd)
             var compressedFragShader = OceanShader.FragmentShader();
             var fragBuffer = Kernel32.GlobalAlloc(default, 8192);
             nint hDcmp;
-            ulong fragLength;
+            nint fragLength;
             bool success;
 
             success = CompressAPI.CreateDecompressor(CompressAlgorithm.MSZip, default, &hDcmp);
             success = CompressAPI.Decompress(
                 hDcmp,
                 compressedFragShader.AsPointer(),
-                (ulong)compressedFragShader.Length,
+                compressedFragShader.Length,
                 fragBuffer,
                 8192,
                 &fragLength

diff --git a/src/SmolSharp.Win32/CompressAPI.cs b/src/SmolSharp.Win32/CompressAPI.cs
@@ -16,10 +16,10 @@ public static extern bool CreateDecompressor(
         public static extern bool Decompress(
             nint decompressorHandle,
             void* compressedData,
-            ulong compressedDataSize,
+            nint compressedDataSize,
             void* uncompressedBuffer,
             nint uncompressedBufferSize,
-            ulong* uncompressedDataSize
+            nint* uncompressedDataSize
         );
     }