bit of cleanup

Author: tjhorner

OVRSharp.Graphics.DirectX/DirectXCompositor.cs

@@ -32,8 +32,7 @@ public Bitmap GetMirrorImage(EVREye eye = EVREye.Eye_Left)
             var bitmap = new Bitmap(texDesc.Width, texDesc.Height);
             var boundsRect = new Rectangle(0, 0, texDesc.Width, texDesc.Height);
 
-            // Copy texture to CPU so we can read from it
-            var cpuTex = new Texture2D(device, new Texture2DDescription
+            using(var cpuTex = new Texture2D(device, new Texture2DDescription
             {
                 CpuAccessFlags = CpuAccessFlags.Read,
                 BindFlags = BindFlags.None,
@@ -45,27 +44,28 @@ public Bitmap GetMirrorImage(EVREye eye = EVREye.Eye_Left)
                 ArraySize = 1,
                 SampleDescription = { Count = 1, Quality = 0 },
                 Usage = ResourceUsage.Staging
-            });
+            }))
+            {
+                // Copy texture to CPU so we can read from it
+                device.ImmediateContext.CopyResource(tex, cpuTex);
+                OpenVR.Compositor.ReleaseMirrorTextureD3D11(srvPtr);
 
-            device.ImmediateContext.CopyResource(tex, cpuTex);
-            OpenVR.Compositor.ReleaseMirrorTextureD3D11(srvPtr);
+                var mapSource = device.ImmediateContext.MapSubresource(cpuTex, 0, MapMode.Read, MapFlags.None);
+                var mapDest = bitmap.LockBits(boundsRect, ImageLockMode.WriteOnly, bitmap.PixelFormat);
+                var sourcePtr = mapSource.DataPointer;
+                var destPtr = mapDest.Scan0;
 
-            var mapSource = device.ImmediateContext.MapSubresource(cpuTex, 0, MapMode.Read, SharpDX.Direct3D11.MapFlags.None);
-            var mapDest = bitmap.LockBits(boundsRect, ImageLockMode.WriteOnly, bitmap.PixelFormat);
-            var sourcePtr = mapSource.DataPointer;
-            var destPtr = mapDest.Scan0;
+                for (int y = 0; y < texDesc.Height; y++)
+                {
+                    Utilities.CopyMemory(destPtr, sourcePtr, texDesc.Width * 4);
+                    sourcePtr = IntPtr.Add(sourcePtr, mapSource.RowPitch);
+                    destPtr = IntPtr.Add(destPtr, mapDest.Stride);
+                }
 
-            for (int y = 0; y < texDesc.Height; y++)
-            {
-                Utilities.CopyMemory(destPtr, sourcePtr, texDesc.Width * 4);
-                sourcePtr = IntPtr.Add(sourcePtr, mapSource.RowPitch);
-                destPtr = IntPtr.Add(destPtr, mapDest.Stride);
+                bitmap.UnlockBits(mapDest);
+                device.ImmediateContext.UnmapSubresource(cpuTex, 0);
             }
 
-            bitmap.UnlockBits(mapDest);
-            device.ImmediateContext.UnmapSubresource(cpuTex, 0);
-            cpuTex.Dispose();
-
             FlipChannels(ref bitmap);
             return bitmap;
         }

OVRSharp.Graphics.DirectX/OVRSharp.Graphics.DirectX.csproj

@@ -12,7 +12,7 @@
     <Copyright>2020-2021 TJ Horner</Copyright>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <Product>OVRSharp</Product>
+    <Product>OVRSharp.Graphics.DirectX</Product>
     <VersionPrefix>1.1.0</VersionPrefix>
     <VersionSuffix>$(VersionSuffix)</VersionSuffix>
   </PropertyGroup>

OVRSharp.Graphics.OpenGL/OVRSharp.Graphics.OpenGL.csproj

@@ -12,9 +12,10 @@
       <Copyright>2020-2021 TJ Horner</Copyright>
       <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
       <GenerateDocumentationFile>true</GenerateDocumentationFile>
-      <Product>OVRSharp</Product>
+      <Product>OVRSharp.Graphics.OpenGL</Product>
       <VersionPrefix>1.1.0</VersionPrefix>
       <VersionSuffix>$(VersionSuffix)</VersionSuffix>
+      <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>