Minor fixes and updates after rebase on 'master'

Author: Ethereal77

sources/core/Stride.Core/Unsafe/StringMarshal.cs

@@ -40,8 +40,7 @@ public class GameWindowRenderer : GameSystemBase
         private PixelFormat preferredBackBufferFormat;
         private int preferredBackBufferHeight;
         private int preferredBackBufferWidth;
-        private PixelFormat preferredDepthStencilFormat;
-        private ColorSpaceType preferredOutputColorSpace;
+        private ColorSpaceType preferredOutputColorSpace = ColorSpaceType.Rgb_Full_G22_None_P709;
 
         private GraphicsPresenter savedPresenter;
 
@@ -59,7 +58,6 @@ public class GameWindowRenderer : GameSystemBase
         public GameWindowRenderer(IServiceRegistry registry, GameContext gameContext) : base(registry)
         {
             GameContext = gameContext;
-            preferredOutputColorSpace = ColorSpaceType.RgbFullG22NoneP709;
         }
 
 
@@ -95,17 +93,21 @@ public PixelFormat PreferredBackBufferFormat
         }
 
         /// <summary>
-        /// Gets or sets the preferred presenter output color space. Can be used to render to HDR monitors. Currently only supported by the DirectX backend.
-        /// See: https://learn.microsoft.com/en-us/windows/win32/direct3darticles/high-dynamic-range
+        ///   Gets or sets the preferred output color space the <see cref="Presenter"/> should use.
         /// </summary>
-        /// <value>The preferred presenter output color space.</value>
+        /// <remarks>
+        ///   <para>
+        ///     The output color space can be used to render to HDR monitors.
+        ///   </para>
+        ///   <para>
+        ///     Note that this is currently only supported in Stride when using the Direct3D Graphics API.
+        ///     For more information about High Dynamic Range (HDR) rendering, see
+        ///     <see href="https://learn.microsoft.com/en-us/windows/win32/direct3darticles/high-dynamic-range"/>.
+        ///   </para>
+        /// </remarks>
         public ColorSpaceType PreferredOutputColorSpace
         {
-            get
-            {
-                return preferredOutputColorSpace;
-            }
-
+            get => preferredOutputColorSpace;
             set
             {
                 if (preferredOutputColorSpace != value)

sources/engine/Stride.Games/GameWindowRenderer.cs

@@ -692,17 +692,16 @@ static ISwapChainPanelNative GetNativePanelFromHandle(WindowHandle windowHandle)
                 result.Throw();
 
             // We need a IDXGISwapChain3 to enable output color space setting to support HDR outputs
-            IDXGISwapChain3* swapChain3;
-            result = newSwapChain->QueryInterface(SilkMarshal.GuidPtrOf<IDXGISwapChain3>(), (void**) &swapChain3);
+            result = newSwapChain.QueryInterface(out ComPtr<IDXGISwapChain3> swapChain3);
 
             if (result.IsSuccess)
             {
-                swapChain3->SetColorSpace1((Silk.NET.DXGI.ColorSpaceType) Description.OutputColorSpace);
-                swapChain3->Release();
+                swapChain3.SetColorSpace1((Silk.NET.DXGI.ColorSpaceType) Description.OutputColorSpace);
+                swapChain3.Release();
             }
 
-            // Prevent switching between windowed and full screen modes by pressing Alt+ENTER
-            GraphicsAdapterFactory.NativeFactory.MakeWindowAssociation(handle, DxgiConstants.WindowAssociation_NoAltEnter);
+            // Prevent switching between windowed and fullscreen modes by pressing Alt+ENTER
+            nativeFactory.MakeWindowAssociation(handle, DxgiConstants.WindowAssociation_NoAltEnter);
 
             if (Description.IsFullScreen)
             {

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

@@ -193,6 +193,9 @@ public virtual void EndDraw(CommandList commandList, bool present)
     ///   The new preferred pixel format for the Back-Buffer. The specified format may be overriden
     ///   depending on Graphics Device features and configuration (for example, to use sRGB when appropriate).
     /// </param>
+    /// <exception cref="System.NotSupportedException">
+    ///   The specified pixel <paramref name="format"/> or size is not supported by the Graphics Device.
+    /// </exception>
     public void Resize(int width, int height, PixelFormat format)
     {
         GraphicsDevice.Begin();
@@ -202,31 +205,66 @@ public void Resize(int width, int height, PixelFormat format)
         Description.BackBufferFormat = NormalizeBackBufferFormat(format);
 
         ResizeBackBuffer(width, height, format);
-        ResizeDepthStencilBuffer(width, height, format);
+        ResizeDepthStencilBuffer(width, height, DepthStencilBuffer.ViewFormat);
 
         GraphicsDevice.End();
     }
 
     /// <summary>
-    /// Sets the output color space of the presenter and the format for the backbuffer. Currently only supported by the DirectX backend.
-    /// Use the following combinations: <br />
-    /// Render to SDR Display with gamma 2.2: <see cref="ColorSpaceType.RgbFullG22NoneP709"/> with <see cref="PixelFormat.R8G8B8A8_UNorm"/>, <see cref="PixelFormat.R8G8B8A8_UNorm_SRgb"/>, <see cref="PixelFormat.B8G8R8A8_UNorm"/>, <see cref="PixelFormat.B8G8R8A8_UNorm"/>. <br />
-    /// Render to HDR Display in scRGB (standard linear), windows DWM will do the color conversion: <see cref="ColorSpaceType.RgbFullG10NoneP709"/> with <see cref="PixelFormat.R16G16B16A16_Float"/> <br />
-    /// Render to HDR Display in HDR10/BT.2100, no windows DWM conversion, rendering needs to be in the Display color space: <see cref="ColorSpaceType.RgbFullG2084NoneP2020"/> with <see cref="PixelFormat.R10G10B10A2_UNorm"/> <br />
+    ///   Sets the output color space of the Graphics Presenter and the pixel format to use for the Back-Buffer.
     /// </summary>
-    /// <param name="colorSpace"></param>
-    /// <param name="format"></param>
+    /// <param name="colorSpace">The output color space the Graphics Presenter should use.</param>
+    /// <param name="format">The pixel format to use for the Back-Buffer.</param>
+    /// <remarks>
+    ///   <para>
+    ///     The output color space can be used to render to HDR monitors.
+    ///   </para>
+    ///   <para>
+    ///     Use the following combinations:
+    ///     <list type="table">
+    ///       <item>
+    ///         <term>For rendering to a SDR display with gamma 2.2</term>
+    ///         <description>
+    ///           Set a color space of <see cref="ColorSpaceType.RgbFullG22NoneP709"/> with a Back-Buffer format <see cref="PixelFormat.R8G8B8A8_UNorm"/>,
+    ///           <see cref="PixelFormat.R8G8B8A8_UNorm_SRgb"/>, <see cref="PixelFormat.B8G8R8A8_UNorm"/>, or <see cref="PixelFormat.B8G8R8A8_UNorm"/>.
+    ///         </description>
+    ///       </item>
+    ///       <item>
+    ///         <term>For rendering to a HDR display in scRGB (standard linear), and letting the Windows DWM do the color conversion</term>
+    ///         <description>
+    ///           Set a color space of <see cref="ColorSpaceType.RgbFullG10NoneP709"/> with a Back-Buffer format <see cref="PixelFormat.R16G16B16A16_Float"/>.
+    ///         </description>
+    ///       </item>
+    ///       <item>
+    ///         <term>
+    ///           For rendering to a HDR display in HDR10 / BT.2100, with no color conversion by the Windows DWM, rendering needs to happen in the
+    ///           same color space as the display.
+    ///         </term>
+    ///         <description>
+    ///           Set a color space of <see cref="ColorSpaceType.RgbFullG2084NoneP2020"/> with a Back-Buffer format <see cref="PixelFormat.R10G10B10A2_UNorm"/>.
+    ///         </description>
+    ///       </item>
+    ///     </list>
+    ///   </para>
+    ///   <para>
+    ///     Note that this is currently only supported in Stride when using the Direct3D Graphics API.
+    ///     For more information about High Dynamic Range (HDR) rendering, see
+    ///     <see href="https://learn.microsoft.com/en-us/windows/win32/direct3darticles/high-dynamic-range"/>.
+    ///   </para>
+    /// </remarks>
+    /// <exception cref="System.NotSupportedException">
+    ///   The specified pixel <paramref name="format"/> or size is not supported by the Graphics Device.
+    /// </exception>
     public void SetOutputColorSpace(ColorSpaceType colorSpace, PixelFormat format)
     {
         GraphicsDevice.Begin();
 
         Description.BackBufferFormat = NormalizeBackBufferFormat(format);
 
-        // new resources
         ResizeBackBuffer(Description.BackBufferWidth, Description.BackBufferHeight, format);
-        ResizeDepthStencilBuffer(Description.BackBufferWidth, Description.BackBufferHeight, depthStencilBuffer.ViewFormat);
+        ResizeDepthStencilBuffer(Description.BackBufferWidth, Description.BackBufferHeight, DepthStencilBuffer.ViewFormat);
 
-        // recreate swapchain
+        // We need to recreate the Swap Chain
         OnDestroyed();
         Description.OutputColorSpace = colorSpace;
         OnRecreated();

sources/engine/Stride.Graphics/GraphicsPresenter.cs

@@ -21,6 +21,7 @@ public sealed class PresentationParameters : IEquatable<PresentationParameters>
     private const bool DefaultIsFullScreen = false;
     private const int DefaultRefreshRate = 60; // Hz
     private const ColorSpace DefaultColorSpace = ColorSpace.Linear;
+    private const ColorSpaceType DefaultOutputColorSpace = ColorSpaceType.Rgb_Full_G22_None_P709; // Default RGB output for monitors with a standard gamma of 2.2
 
     #endregion
 
@@ -193,6 +194,22 @@ public sealed class PresentationParameters : IEquatable<PresentationParameters>
     /// </remarks>
     public ColorSpace ColorSpace;
 
+    /// <summary>
+    ///   The color space type used for the Graphics Presenter output.
+    /// </summary>
+    /// <remarks>
+    ///   <para>
+    ///     The output color space can be used to render to HDR monitors.
+    ///     Consult the documentation of the <see cref="ColorSpaceType"/> enum for more details.
+    ///   </para>
+    ///   <para>
+    ///     Note that this is currently only supported in Stride when using the Direct3D Graphics API.
+    ///     For more information about High Dynamic Range (HDR) rendering, see
+    ///     <see href="https://learn.microsoft.com/en-us/windows/win32/direct3darticles/high-dynamic-range"/>.
+    ///   </para>
+    /// </remarks>
+    public ColorSpaceType OutputColorSpace;
+
 
     /// <summary>
     ///   Initializes a new instance of the <see cref="PresentationParameters"/> class with default values.
@@ -209,7 +226,11 @@ public sealed class PresentationParameters : IEquatable<PresentationParameters>
     ///       (<see cref="PixelFormat.D24_UNorm_S8_UInt"/>).
     ///     </item>
     ///     <item>No multi-sampling.</item>
-    ///     <item>Assuming a linear color space (<see cref="ColorSpace.Linear"/>).</item>
+    ///     <item>
+    ///       Assuming a linear color space (<see cref="ColorSpace.Linear"/>) and an output color space
+    ///       <see cref="ColorSpaceType.RgbFullG22NoneP709"/>, which is the default RGB output for monitors
+    ///       with a standard gamma of 2.2.
+    ///     </item>
     ///     <item>
     ///       A windowed presentation at 60 Hz with no V-Sync (<see cref="PresentInterval.Immediate"/>).
     ///     </item>
@@ -226,6 +247,7 @@ public PresentationParameters()
         IsFullScreen = DefaultIsFullScreen;
         RefreshRate = DefaultRefreshRate;
         ColorSpace = DefaultColorSpace;
+        OutputColorSpace = DefaultOutputColorSpace;
     }
 
     /// <summary>

sources/engine/Stride.Graphics/PresentationParameters.cs

@@ -22,7 +22,7 @@ public override unsafe void Initialize()
             var graphicsDevice = Services.GetService<IGame>().GraphicsDevice;
 
             var d3d11Device = graphicsDevice.NativeDevice;
-            var d3d11DeviceSharpDX = new SharpDX.ComObject((IntPtr) d3d11Device);
+            var d3d11DeviceSharpDX = new SharpDX.ComObject((IntPtr) d3d11Device.Handle);
 
             DxgiDeviceManager = new DXGIDeviceManager();
             DxgiDeviceManager.ResetDevice(d3d11DeviceSharpDX);

sources/engine/Stride.Video/VideoSystem.Direct3D.cs

@@ -36,178 +36,3 @@ public enum ColorSpace
     /// </remarks>
     Gamma
 }
-
-/// <summary>
-///   Specifies the type of color space a Graphics Presenter has to output.
-/// </summary>
-/// <remarks>
-///   <para>
-///     This enum is used within a Graphics Presenter when configuring a Swap Chain to check
-///     the color space support of the Graphics Adapter and the Graphics Output, set a
-///     specific color space as output of the Swap Chain. It is also referenced in D3D11 video methods
-///   </para>
-///   <para>
-///     It is also used for defining the output color space of video decoding.
-///   </para>
-/// </remarks>
-public enum ColorSpaceType
-{
-    /// <summary>
-    /// ColorspaceRGB Range0-255 Gamma2.2 SitingImage PrimariesBT.709. Use with backbuffer of 8 bit colors, such as PixelFormat.B8G8R8A8_UNorm.
-    /// This is the standard definition for sRGB. Note that this is often implemented
-    /// with a linear segment, but in that case, the exponent is corrected to stay aligned
-    /// with a gamma 2.2 curve. This is usually used with 8-bit and 10-bit color channels.
-    /// </summary>
-    RgbFullG22NoneP709 = 0,
-
-    /// <summary>
-    /// ColorspaceRGB Range0-255 Gamma1.0 SitingImage PrimariesBT.709. Use with backbuffer of 16 bit colors, PixelFormat.R16G16B16A16_Float.
-    /// This is the standard definition for scRGB, and is usually used with 16-bit integer,
-    /// 16-bit floating point, and 32-bit floating point channels.
-    /// </summary>
-    RgbFullG10NoneP709 = 1,
-
-    /// <summary>
-    /// ColorspaceRGB Range16-235 Gamma2.2 SitingImage PrimariesBT.709.
-    /// This is the standard definition for ITU-R Recommendation BT.709. Note that
-    /// due to the inclusion of a linear segment, the transfer curve looks similar to
-    /// a pure exponential gamma of 1.9. This is usually used with 8-bit and 10-bit color
-    /// channels.
-    /// </summary>
-    RgbStudioG22NoneP709 = 2,
-
-    /// <summary>
-    /// ColorspaceRGB Range16-235 Gamma2.2 SitingImage PrimariesBT.2020.
-    /// This is usually used with 10, 12, or 16-bit color channels.
-    /// </summary>
-    RgbStudioG22NoneP2020 = 3,
-
-    /// <summary>
-    /// Reserved.
-    /// </summary>
-    Reserved = 4,
-
-    /// <summary>
-    /// ColorspaceYCbCr Range0-255 Gamma2.2 SitingImage PrimariesBT.709 TransferBT.601.
-    /// This definition is commonly used for JPG, and is usually used with 8, 10, 12,
-    /// or 16-bit color channels.
-    /// </summary>
-    YcbcrFullG22NoneP709X601 = 5,
-
-    /// <summary>
-    /// ColorspaceYCbCr Range16-235 Gamma2.2 SitingVideo PrimariesBT.601.
-    /// This definition is commonly used for MPEG2, and is usually used with 8, 10, 12,
-    /// or 16-bit color channels.
-    /// </summary>
-    YcbcrStudioG22LeftP601 = 6,
-
-    /// <summary>
-    /// ColorspaceYCbCr Range0-255 Gamma2.2 SitingVideo PrimariesBT.601.
-    /// This is sometimes used for H.264 camera capture, and is usually used with 8, 10,
-    /// 12, or 16-bit color channels.
-    /// </summary>
-    YcbcrFullG22LeftP601 = 7,
-
-    /// <summary>
-    /// ColorspaceYCbCr Range16-235 Gamma2.2 SitingVideo PrimariesBT.709.
-    /// This definition is commonly used for H.264 and HEVC, and is usually used with
-    /// 8, 10, 12, or 16-bit color channels.
-    /// </summary>
-    YcbcrStudioG22LeftP709 = 8,
-
-    /// <summary>
-    /// ColorspaceYCbCr Range0-255 Gamma2.2 SitingVideo PrimariesBT.709.
-    /// This is sometimes used for H.264 camera capture, and is usually used with 8, 10,
-    /// 12, or 16-bit color channels.
-    /// </summary>
-    YcbcrFullG22LeftP709 = 9,
-
-    /// <summary>
-    /// ColorspaceYCbCr Range16-235 Gamma2.2 SitingVideo PrimariesBT.2020.
-    /// This definition may be used by HEVC, and is usually used with 10, 12, or 16-bit
-    /// color channels.
-    /// </summary>
-    YcbcrStudioG22LeftP2020 = 10,
-
-    /// <summary>
-    /// ColorspaceYCbCr Range0-255 Gamma2.2 SitingVideo PrimariesBT.2020.
-    /// This is usually used with 10, 12, or 16-bit color channels.
-    /// </summary>
-    YcbcrFullG22LeftP2020 = 11,
-
-    /// <summary>
-    /// ColorspaceRGB Range0-255 Gamma2084 SitingImage PrimariesBT.2020. Use with backbuffer of 10 bit colors, PixelFormat.R10G10B10A2_UNorm.
-    /// This is usually used with 10, 12, or 16-bit color channels.
-    /// </summary>
-    RgbFullG2084NoneP2020 = 12,
-
-    /// <summary>
-    /// ColorspaceYCbCr Range16-235 Gamma2084 SitingVideo PrimariesBT.2020.
-    /// This is usually used with 10, 12, or 16-bit color channels.
-    /// </summary>
-    YcbcrStudioG2084LeftP2020 = 13,
-
-    /// <summary>
-    /// ColorspaceRGB Range16-235 Gamma2084 SitingImage PrimariesBT.2020.
-    /// This is usually used with 10, 12, or 16-bit color channels.
-    /// </summary>
-    RgbStudioG2084NoneP2020 = 14,
-
-    /// <summary>
-    /// ColorspaceYCbCr Range16-235 Gamma2.2 SitingVideo PrimariesBT.2020.
-    /// This is usually used with 10, 12, or 16-bit color channels.
-    /// </summary>
-    YcbcrStudioG22TopleftP2020 = 15,
-
-    /// <summary>
-    /// ColorspaceYCbCr Range16-235 Gamma2084 SitingVideo PrimariesBT.2020.
-    /// This is usually used with 10, 12, or 16-bit color channels.
-    /// </summary>
-    YcbcrStudioG2084TopleftP2020 = 16,
-
-    /// <summary>
-    /// ColorspaceRGB Range0-255 Gamma2.2 SitingImage PrimariesBT.2020.
-    /// This is usually used with 10, 12, or 16-bit color channels.
-    /// </summary>
-    RgbFullG22NoneP2020 = 17,
-
-    /// <summary>
-    /// A custom color definition is used.
-    /// </summary>
-    YcbcrStudioGhlgTopleftP2020 = 18,
-
-    /// <summary>
-    /// No documentation.
-    /// </summary>
-    YcbcrFullGhlgTopleftP2020 = 19,
-
-    /// <summary>
-    /// No documentation.
-    /// </summary>
-    RgbStudioG24NoneP709 = 20,
-
-    /// <summary>
-    /// No documentation.
-    /// </summary>
-    RgbStudioG24NoneP2020 = 21,
-
-    /// <summary>
-    /// No documentation.
-    /// </summary>
-    YcbcrStudioG24LeftP709 = 22,
-
-    /// <summary>
-    /// No documentation.
-    /// </summary>
-    YcbcrStudioG24LeftP2020 = 23,
-
-    /// <summary>
-    /// No documentation.
-    /// </summary>
-    YcbcrStudioG24TopleftP2020 = 24,
-
-    /// <summary>
-    /// A custom color definition is used.
-    /// </summary>
-    Custom = -1
-}