inline OnPresentationChanged (#1593)

kniEngine · May 22, 2024 · d6c6f9b · d6c6f9b
1 parent 492bac9
commit d6c6f9b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 31 deletions.
diff --git a/MonoGame.Framework/.Blazor/ConcreteGraphicsDeviceManager.cs b/MonoGame.Framework/.Blazor/ConcreteGraphicsDeviceManager.cs
@@ -155,7 +155,10 @@ public override void CreateDevice()
                 gameWindow.EnterFullScreen(pp);
 
                 if (!pp.HardwareModeSwitch)
-                    ((IPlatformGraphicsDevice)this.GraphicsDevice).Strategy.ToConcrete<ConcreteGraphicsDevice>().OnPresentationChanged();
+                {
+                    ConcreteGraphicsDevice cgd = ((IPlatformGraphicsDevice)this.GraphicsDevice).Strategy.ToConcrete<ConcreteGraphicsDevice>();
+                    ((IPlatformGraphicsContext)cgd.MainContext).Strategy.ApplyRenderTargets(null);
+                }
             }
         }
 

diff --git a/MonoGame.Framework/.WindowsDX11/ConcreteGraphicsDeviceManager.cs b/MonoGame.Framework/.WindowsDX11/ConcreteGraphicsDeviceManager.cs
@@ -155,7 +155,11 @@ public override void CreateDevice()
                 gameWindow.EnterFullScreen(pp);
 
                 if (!pp.HardwareModeSwitch)
-                    ((IPlatformGraphicsDevice)this.GraphicsDevice).Strategy.ToConcrete<ConcreteGraphicsDevice>().OnPresentationChanged();
+                {
+                    ConcreteGraphicsDevice cgd = ((IPlatformGraphicsDevice)this.GraphicsDevice).Strategy.ToConcrete<ConcreteGraphicsDevice>();
+                    cgd.Internal_CreateSizeDependentResources();
+                    ((IPlatformGraphicsContext)cgd.MainContext).Strategy.ApplyRenderTargets(null);
+                }
             }
         }
 

diff --git a/MonoGame.Framework/Graphics/.BlazorGL/ConcreteGraphicsDevice.cs b/MonoGame.Framework/Graphics/.BlazorGL/ConcreteGraphicsDevice.cs
@@ -37,8 +37,7 @@ public override void Reset(PresentationParameters presentationParameters)
 
         public override void Reset()
         {
-            // Update the back buffer.
-            this.OnPresentationChanged();
+            ((IPlatformGraphicsContext)_mainContext).Strategy.ApplyRenderTargets(null);
         }
 
         public override void Present(Rectangle? sourceRectangle, Rectangle? destinationRectangle, IntPtr overrideWindowHandle)
@@ -175,11 +174,6 @@ public override System.Reflection.Assembly ConcreteAssembly
             get { return ReflectionHelpers.GetAssembly(typeof(ConcreteGraphicsDevice)); }
         }
 
-        internal void OnPresentationChanged()
-        {
-            ((IPlatformGraphicsContext)_mainContext).Strategy.ApplyRenderTargets(null);
-        }
-
 
         protected override void Dispose(bool disposing)
         {

diff --git a/MonoGame.Framework/Graphics/.DX11/ConcreteGraphicsDevice.cs b/MonoGame.Framework/Graphics/.DX11/ConcreteGraphicsDevice.cs
@@ -84,8 +84,8 @@ public override void Reset()
             if (PresentationParameters.DeviceWindowHandle == IntPtr.Zero)
                 throw new ArgumentException("PresentationParameters.DeviceWindowHandle must not be null.");
 
-            // Update the back buffer.
-            this.OnPresentationChanged();
+            CreateSizeDependentResources();
+            ((IPlatformGraphicsContext)_mainContext).Strategy.ApplyRenderTargets(null);
         }
 
         public override void Present(Rectangle? sourceRectangle, Rectangle? destinationRectangle, IntPtr overrideWindowHandle)
@@ -529,6 +529,10 @@ internal void SetMultiSamplingToMaximum(PresentationParameters presentationParam
         }
 #endif
 
+        internal void Internal_CreateSizeDependentResources()
+        {
+            this.CreateSizeDependentResources();
+        }
 
         private void CreateSizeDependentResources()
         {
@@ -946,12 +950,6 @@ public override System.Reflection.Assembly ConcreteAssembly
             get { return ReflectionHelpers.GetAssembly(typeof(ConcreteGraphicsDevice)); }
         }
 
-        internal void OnPresentationChanged()
-        {
-            CreateSizeDependentResources();
-            ((IPlatformGraphicsContext)_mainContext).Strategy.ApplyRenderTargets(null);
-        }
-
 
         protected override void Dispose(bool disposing)
         {

diff --git a/MonoGame.Framework/Graphics/.GL/ConcreteGraphicsDevice.cs b/MonoGame.Framework/Graphics/.GL/ConcreteGraphicsDevice.cs
@@ -44,8 +44,13 @@ public override void Reset(PresentationParameters presentationParameters)
 
         public override void Reset()
         {
-            // Update the back buffer.
-            this.OnPresentationChanged();
+#if DESKTOPGL
+            ((IPlatformGraphicsContext)_mainContext).Strategy.ToConcrete<ConcreteGraphicsContext>().MakeCurrent(this.PresentationParameters.DeviceWindowHandle);
+            int swapInterval = ConcreteGraphicsContext.ToGLSwapInterval(this.PresentationParameters.PresentationInterval);
+            Sdl.Current.OpenGL.SetSwapInterval(swapInterval);
+#endif
+
+            ((IPlatformGraphicsContext)_mainContext).Strategy.ApplyRenderTargets(null);
         }
 
         public override void Present(Rectangle? sourceRectangle, Rectangle? destinationRectangle, IntPtr overrideWindowHandle)
@@ -145,18 +150,6 @@ internal int GetMaxMultiSampleCount(SurfaceFormat surfaceFormat)
             return maxMultiSampleCount;
         }
 
-        internal void OnPresentationChanged()
-        {
-#if DESKTOPGL
-            ((IPlatformGraphicsContext)_mainContext).Strategy.ToConcrete<ConcreteGraphicsContext>().MakeCurrent(this.PresentationParameters.DeviceWindowHandle);
-            int swapInterval = ConcreteGraphicsContext.ToGLSwapInterval(this.PresentationParameters.PresentationInterval);
-            Sdl.Current.OpenGL.SetSwapInterval(swapInterval);
-#endif
-
-            ((IPlatformGraphicsContext)_mainContext).Strategy.ApplyRenderTargets(null);
-        }
-
-
         protected override void Dispose(bool disposing)
         {
             if (disposing)