Minor fixes for all graphics APIs

Author: Ethereal77

sources/core/Stride.Core/Storage/ObjectId.cs

@@ -269,6 +269,19 @@ public static ObjectId New()
             return FromBytes(Guid.NewGuid().ToByteArray());
         }
 
+        /// <summary>
+        /// Computes a hash from a byte buffer.
+        /// </summary>
+        /// <param name="buffer">The byte buffer.</param>
+        /// <returns>The hash of the object.</returns>
+        /// <exception cref="System.ArgumentNullException">buffer</exception>
+        public static ObjectId FromBytes(ReadOnlySpan<byte> buffer)
+        {
+            var builder = new ObjectIdBuilder();
+            builder.Write(buffer);
+            return builder.ComputeHash();
+        }
+
         /// <summary>
         /// Computes a hash from a byte buffer.
         /// </summary>

sources/engine/Stride.Graphics/Direct3D/SwapChainGraphicsPresenter.Direct3D.cs

@@ -32,7 +32,7 @@
 #if STRIDE_GRAPHICS_API_DIRECT3D11
 using BackBufferResourceType = Silk.NET.Direct3D11.ID3D11Texture2D;
 #elif STRIDE_GRAPHICS_API_DIRECT3D12
-using BackBufferResourceType = SharpDX.Direct3D12.Resource;
+using BackBufferResourceType = Silk.NET.Direct3D12.ID3D12Resource;
 #endif
 
 namespace Stride.Graphics
@@ -54,7 +54,7 @@ public unsafe class SwapChainGraphicsPresenter : GraphicsPresenter
         private int bufferCount;
 
 #if STRIDE_GRAPHICS_API_DIRECT3D12
-        private int bufferSwapIndex;
+        private uint bufferSwapIndex;
 #endif
 
         public SwapChainGraphicsPresenter(GraphicsDevice device, PresentationParameters presentationParameters)
@@ -272,7 +272,7 @@ public override void Present()
                 ? DXGI.PresentAllowTearing
                 : 0;
 
-            HResult result = swapChain->Present((uint) presentInterval, (uint) presentFlags);
+            HResult result = swapChain->Present((uint) presentInterval,  presentFlags);
 
             if (result.IsFailure)
             {
@@ -285,7 +285,7 @@ public override void Present()
 #if STRIDE_GRAPHICS_API_DIRECT3D12
             // Manually swap back buffer
             backBuffer.NativeResource->Release();
-            bufferSwapIndex = (++bufferSwapIndex) % bufferCount;
+            bufferSwapIndex = (uint)((++bufferSwapIndex) % bufferCount);
             var nextBackBuffer = GetBackBuffer<BackBufferResourceType>(bufferSwapIndex);
             backBuffer.InitializeFromImpl(nextBackBuffer, Description.BackBufferFormat.IsSRgb());
 #endif

sources/engine/Stride.Graphics/Direct3D12/GraphicsResourceBase.Direct3D12.cs

@@ -4,8 +4,10 @@
 #if STRIDE_GRAPHICS_API_DIRECT3D12
 
 using System;
+using System.Diagnostics;
 using Silk.NET.Core.Native;
 using Silk.NET.Direct3D12;
+using Stride.Core;
 
 namespace Stride.Graphics
 {
@@ -28,15 +30,30 @@ protected internal ID3D12DeviceChild* NativeDeviceChild
 
             set
             {
+                if (nativeDeviceChild == value)
+                    return;
+
+                var oldDeviceChild = nativeDeviceChild;
+                if (oldDeviceChild != null)
+                    oldDeviceChild->Release();
+
                 nativeDeviceChild = value;
+                if (nativeDeviceChild != null)
+                    nativeDeviceChild->AddRef();
+                else
+                    return;
+
+                Debug.Assert(nativeDeviceChild != null);
 
                 ID3D12Resource* d3d12Resource;
                 HResult result = nativeDeviceChild->QueryInterface(SilkMarshal.GuidPtrOf<ID3D12Resource>(), (void**) &d3d12Resource);
 
-                if (result.IsFailure)
-                    result.Throw();
-
-                NativeResource = d3d12Resource;
+                // The device child can be something that is not a Direct3D resource actually,
+                // like a Sampler State, for example
+                if (result.IsSuccess)
+                {
+                    NativeResource = d3d12Resource;
+                }
 
                 // Associate PrivateData to this DeviceResource
                 SetDebugName(GraphicsDevice, nativeDeviceChild, Name);

sources/engine/Stride.Graphics/OpenGL/CommandList.OpenGL.cs

@@ -89,7 +89,7 @@ public void Reset()
 
         public void Flush()
         {
-            
+
         }
 
         public CompiledCommandList Close()
@@ -1080,7 +1080,7 @@ private unsafe MappedResource MapTexture(Texture texture, bool adjustOffsetForSu
 
             return new MappedResource(texture, subResourceIndex, new DataBox { DataPointer = mapResult, SlicePitch = texture.ComputeSlicePitch(mipLevel), RowPitch = texture.ComputeRowPitch(mipLevel) }, offsetInBytes, lengthInBytes)
             {
-                PixelBufferObjectId = pixelBufferObjectId,
+                PixelBufferObjectId = pixelBufferObjectId
             };
         }
 
@@ -1352,7 +1352,7 @@ internal void SetUnorderedAccessView(ShaderStage stage, int slot, GraphicsResour
 
             Internal.Refactor.ThrowNotImplementedException();
         }
-        
+
         /// <summary>
         /// Unsets an unordered access view from the shader pipeline.
         /// </summary>
@@ -1362,7 +1362,7 @@ internal void UnsetUnorderedAccessView(GraphicsResource unorderedAccessView)
 #if DEBUG
             GraphicsDevice.EnsureContextActive();
 #endif
-            
+
             //Internal.Refactor.ThrowNotImplementedException();
         }
 

sources/engine/Stride.Graphics/OpenGL/GLCoreLibraryNameContainer.cs

@@ -1,7 +1,9 @@
 // Copyright (c) Silk.NET
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-#if STRIDE_GRAPHICS_API_OPENGL 
+
+#if STRIDE_GRAPHICS_API_OPENGL
+
 using Silk.NET.Core.Loader;
 
 namespace Silk.NET.OpenGL
@@ -12,22 +14,23 @@ namespace Silk.NET.OpenGL
     internal class GLCoreLibraryNameContainer : SearchPathContainer
     {
         /// <inheritdoc />
-        public override string Linux => "libGL.so.1";
+        public override string[] Linux => new[] { "libGL.so.1" };
 
         /// <inheritdoc />
-        public override string MacOS => "/System/Library/Frameworks/OpenGL.framework/OpenGL";
+        public override string[] MacOS => new[] { "/System/Library/Frameworks/OpenGL.framework/OpenGL" };
 
         /// <inheritdoc />
-        public override string Android => "libGL.so.1";
+        public override string[] Android => new[] { "libGL.so.1" };
 
         /// <inheritdoc />
-        public override string IOS => "/System/Library/Frameworks/OpenGL.framework/OpenGL";
+        public override string[] IOS => new[] { "/System/Library/Frameworks/OpenGL.framework/OpenGL" };
 
         /// <inheritdoc />
-        public override string Windows64 => "opengl32.dll";
+        public override string[] Windows64 => new[] { "opengl32.dll" };
 
         /// <inheritdoc />
-        public override string Windows86 => "opengl32.dll";
+        public override string[] Windows86 => new[] { "opengl32.dll" };
     }
 }
+
 #endif

sources/engine/Stride.Graphics/OpenGL/GraphicsAdapter.OpenGL.cs

@@ -2,7 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 #if STRIDE_GRAPHICS_API_OPENGL
-using System.Linq;
+
 using Silk.NET.SDL;
 using Stride.Graphics.OpenGL;
 
@@ -21,7 +21,7 @@ public unsafe partial class GraphicsAdapter
 
         internal GraphicsAdapter()
         {
-            outputs = new [] { new GraphicsOutput() };
+            Outputs = new [] { new GraphicsOutput() };
 
             // set default values
             int detectedVersion = 100;

sources/engine/Stride.Graphics/OpenGL/GraphicsDeviceFeatures.OpenGL.cs

@@ -1,27 +1,28 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
 #if STRIDE_GRAPHICS_API_OPENGL
+
 // Copyright (c) 2010-2012 SharpDX - Alexandre Mutel
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using System;
-using System.Collections.Generic;
+
 using Stride.Graphics.OpenGL;
 using Stride.Core.Diagnostics;
 
@@ -36,7 +37,7 @@ namespace Stride.Graphics
     public partial struct GraphicsDeviceFeatures
     {
         private const GetPName GL_MAX_SAMPLES = (GetPName)36183;    // We define this constant here because it is not contained within OpenTK...
-    
+
         private static Logger logger = GlobalLogger.GetLogger(nameof(GraphicsDeviceFeatures));
 
         private void EnumerateMSAASupportPerFormat(GraphicsDevice deviceRoot)
@@ -71,7 +72,7 @@ private void EnumerateMSAASupportPerFormat(GraphicsDevice deviceRoot)
             for (int i = 0; i < mapFeaturesPerFormat.Length; i++)
             {
                 // TODO: This ignores the supported multisample capabilities of each render target format. But I don't know how to query this in OpenGL (assuming it's even possible at all).
-                mapFeaturesPerFormat[i] = new FeaturesPerFormat((PixelFormat)i, actualMultisampleCount, FormatSupport.None);
+                mapFeaturesPerFormat[i] = new FeaturesPerFormat((PixelFormat)i, actualMultisampleCount, ComputeShaderFormatSupport.None, FormatSupport.None);
             }
         }
 
@@ -155,4 +156,5 @@ internal GraphicsDeviceFeatures(GraphicsDevice deviceRoot)
         }
     }
 }
+
 #endif

sources/engine/Stride.Graphics/OpenGL/MappedResource.OpenGL.cs

@@ -2,11 +2,13 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 #if STRIDE_GRAPHICS_API_OPENGL
+
 namespace Stride.Graphics
 {
     public partial struct MappedResource
     {
-        internal uint PixelBufferObjectId;
+        internal uint PixelBufferObjectId { get; init; }
     }
 }
+
 #endif

sources/engine/Stride.Graphics/OpenGL/OpenGLESLibraryNameContainer.cs

@@ -1,7 +1,9 @@
 // Copyright (c) Silk.NET
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-#if STRIDE_GRAPHICS_API_OPENGL 
+
+#if STRIDE_GRAPHICS_API_OPENGL
+
 using Silk.NET.Core.Loader;
 
 namespace Silk.NET.OpenGLES
@@ -12,22 +14,23 @@ namespace Silk.NET.OpenGLES
     internal class OpenGLESLibraryNameContainer : SearchPathContainer
     {
         /// <inheritdoc />
-        public override string Linux => "libGLESv2.so";
+        public override string[] Linux => new[] { "libGLESv2.so" };
 
         /// <inheritdoc />
-        public override string MacOS => "/System/Library/Frameworks/OpenGLES.framework/OpenGLES";
+        public override string[] MacOS => new[] { "/System/Library/Frameworks/OpenGLES.framework/OpenGLES" };
 
         /// <inheritdoc />
-        public override string Android => "libGLESv2.so";
+        public override string[] Android => new[] { "libGLESv2.so" };
 
         /// <inheritdoc />
-        public override string IOS => "/System/Library/Frameworks/OpenGLES.framework/OpenGLES";
+        public override string[] IOS => new[] { "/System/Library/Frameworks/OpenGLES.framework/OpenGLES" };
 
         /// <inheritdoc />
-        public override string Windows64 => "libGLESv2.dll";
+        public override string[] Windows64 => new[] { "libGLESv2.dll" };
 
         /// <inheritdoc />
-        public override string Windows86 => "libGLESv2.dll";
+        public override string[] Windows86 => new[] { "libGLESv2.dll" };
     }
 }
+
 #endif

sources/engine/Stride.Graphics/Vulkan/GraphicsAdapter.Vulkan.cs

@@ -1,26 +1,23 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
 #if STRIDE_GRAPHICS_API_VULKAN
+
 using System;
 using System.Collections.Generic;
-using System.Resources;
 using System.Runtime.InteropServices;
-using System.Text;
 using Vortice.Vulkan;
-using static Vortice.Vulkan.Vulkan;
-using Stride.Core;
 
-using ComponentBase = Stride.Core.ComponentBase;
-using Utilities = Stride.Core.Utilities;
+using static Vortice.Vulkan.Vulkan;
 
 namespace Stride.Graphics
 {
     /// <summary>
     /// Provides methods to retrieve and manipulate graphics adapters. This is the equivalent to <see cref="Adapter1"/>.
     /// </summary>
-    /// <msdn-id>ff471329</msdn-id>	
-    /// <unmanaged>IDXGIAdapter1</unmanaged>	
-    /// <unmanaged-short>IDXGIAdapter1</unmanaged-short>	
+    /// <msdn-id>ff471329</msdn-id>
+    /// <unmanaged>IDXGIAdapter1</unmanaged>
+    /// <unmanaged-short>IDXGIAdapter1</unmanaged-short>
     public partial class GraphicsAdapter
     {
         private VkPhysicalDevice defaultPhysicalDevice;
@@ -56,7 +53,7 @@ internal GraphicsAdapter(VkPhysicalDevice defaultPhysicalDevice, int adapterOrdi
             //outputs = new GraphicsOutput[displayProperties.Length];
             //for (var i = 0; i < outputs.Length; i++)
             //    outputs[i] = new GraphicsOutput(this, displayProperties[i], i).DisposeBy(this);
-            outputs = new[] { new GraphicsOutput() };
+            Outputs = new[] { new GraphicsOutput() };
         }
 
         /// <summary>
@@ -132,5 +129,6 @@ public bool IsProfileSupported(GraphicsProfile graphicsProfile)
             //return SharpDX.Direct3D11.Device.IsSupportedFeatureLevel(this.NativeAdapter, (SharpDX.Direct3D.FeatureLevel)graphicsProfile);
         }
     }
-} 
+}
+
 #endif