swap Reset(...) (#1594)

* inline GraphicsDeviceStrategy.Reset() * use GraphicsDeviceStrategy.Reset(PresentationParameters) * inline GraphicsDeviceStrategy.Reset() * use GraphicsDevice.Reset(PresentationParameters) * refactor Reset(PresentationParameters)
kniEngine · May 22, 2024 · b1644f6 · b1644f6
1 parent d6c6f9b
commit b1644f6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 30 deletions.
diff --git a/MonoGame.Framework/Graphics/.BlazorGL/ConcreteGraphicsDevice.cs b/MonoGame.Framework/Graphics/.BlazorGL/ConcreteGraphicsDevice.cs
@@ -31,12 +31,8 @@ internal ConcreteGraphicsDevice(GraphicsDevice device, GraphicsAdapter adapter,
 
         public override void Reset(PresentationParameters presentationParameters)
         {
-            PresentationParameters = presentationParameters;
-            Reset();
-        }
+            this.PresentationParameters = presentationParameters;
 
-        public override void Reset()
-        {
             ((IPlatformGraphicsContext)_mainContext).Strategy.ApplyRenderTargets(null);
         }
 

diff --git a/MonoGame.Framework/Graphics/.DX11/ConcreteGraphicsDevice.cs b/MonoGame.Framework/Graphics/.DX11/ConcreteGraphicsDevice.cs
@@ -71,17 +71,13 @@ internal ConcreteGraphicsDevice(GraphicsDevice device, GraphicsAdapter adapter,
 
         public override void Reset(PresentationParameters presentationParameters)
         {
-            PresentationParameters = presentationParameters;
-            Reset();
-        }
+            this.PresentationParameters = presentationParameters;
 
-        public override void Reset()
-        {
 #if WINDOWSDX
             CorrectBackBufferSize();
 #endif
 
-            if (PresentationParameters.DeviceWindowHandle == IntPtr.Zero)
+            if (this.PresentationParameters.DeviceWindowHandle == IntPtr.Zero)
                 throw new ArgumentException("PresentationParameters.DeviceWindowHandle must not be null.");
 
             CreateSizeDependentResources();

diff --git a/MonoGame.Framework/Graphics/.GL/ConcreteGraphicsDevice.cs b/MonoGame.Framework/Graphics/.GL/ConcreteGraphicsDevice.cs
@@ -38,12 +38,8 @@ internal ConcreteGraphicsDeviceGL(GraphicsDevice device, GraphicsAdapter adapter
 
         public override void Reset(PresentationParameters presentationParameters)
         {
-            PresentationParameters = presentationParameters;
-            Reset();
-        }
+            this.PresentationParameters = presentationParameters;
 
-        public override void Reset()
-        {
 #if DESKTOPGL
             ((IPlatformGraphicsContext)_mainContext).Strategy.ToConcrete<ConcreteGraphicsContext>().MakeCurrent(this.PresentationParameters.DeviceWindowHandle);
             int swapInterval = ConcreteGraphicsContext.ToGLSwapInterval(this.PresentationParameters.PresentationInterval);

diff --git a/MonoGame.Framework/Graphics/.Ref/ConcreteGraphicsDevice.cs b/MonoGame.Framework/Graphics/.Ref/ConcreteGraphicsDevice.cs
@@ -23,11 +23,6 @@ public override void Reset(PresentationParameters presentationParameters)
             throw new PlatformNotSupportedException();
         }
 
-        public override void Reset()
-        {
-            throw new PlatformNotSupportedException();
-        }
-
         public override void Present(Rectangle? sourceRectangle, Rectangle? destinationRectangle, IntPtr overrideWindowHandle)
         {
             throw new PlatformNotSupportedException();

diff --git a/src/Xna.Framework.Graphics/Graphics/GraphicsDevice.cs b/src/Xna.Framework.Graphics/Graphics/GraphicsDevice.cs
@@ -336,13 +336,7 @@ private void OnDeviceReset(EventArgs e)
 
         public void Reset()
         {
-            _strategy.OnDeviceResetting(EventArgs.Empty);
-
-            _strategy.Reset();
-
-            _strategy.OnPresentationChanged(new PresentationEventArgs(PresentationParameters));
-
-            _strategy.OnDeviceReset(EventArgs.Empty);
+            Reset(this.PresentationParameters);
         }
 
         public void Reset(PresentationParameters presentationParameters)
@@ -354,7 +348,7 @@ public void Reset(PresentationParameters presentationParameters)
 
             _strategy.Reset(presentationParameters);
 
-            _strategy.OnPresentationChanged(new PresentationEventArgs(PresentationParameters));
+            _strategy.OnPresentationChanged(new PresentationEventArgs(this.PresentationParameters));
 
             _strategy.OnDeviceReset(EventArgs.Empty);
         }

diff --git a/src/Xna.Framework.Graphics/Graphics/GraphicsDeviceStrategy.cs b/src/Xna.Framework.Graphics/Graphics/GraphicsDeviceStrategy.cs
@@ -215,7 +215,6 @@ protected internal void OnDeviceReset(EventArgs e)
         }
 
 
-        public abstract void Reset();
         public abstract void Reset(PresentationParameters presentationParameters);
         public abstract void Present(Rectangle? sourceRectangle, Rectangle? destinationRectangle, IntPtr overrideWindowHandle);
         public virtual void Present()