Fix build.

SickheadGames · Jul 6, 2024 · 7bb79bf · 7bb79bf
1 parent b6a7322
commit 7bb79bf
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/MonoGame.Framework/Platform/Graphics/SamplerStateCollection.DirectX.cs b/MonoGame.Framework/Platform/Graphics/SamplerStateCollection.DirectX.cs
@@ -27,7 +27,7 @@ private void PlatformDirty()
 
         internal void PlatformSetSamplers(GraphicsDevice device)
         {
-            if (_applyToVertexStage && !device.GraphicsCapabilities.SupportsVertexTextures)
+            if (_stage == ShaderStage.Vertex && !device.GraphicsCapabilities.SupportsVertexTextures)
                 return;
 
             // Skip out if nothing has changed.
@@ -37,7 +37,7 @@ internal void PlatformSetSamplers(GraphicsDevice device)
             // NOTE: We make the assumption here that the caller has
             // locked the d3dContext for us to use.
             SharpDX.Direct3D11.CommonShaderStage shaderStage;
-            if (_applyToVertexStage)
+            if (_stage == ShaderStage.Vertex)
 	            shaderStage = device._d3dContext.VertexShader;
             else
 	            shaderStage = device._d3dContext.PixelShader;

diff --git a/MonoGame.Framework/Platform/Graphics/TextureCollection.DirectX.cs b/MonoGame.Framework/Platform/Graphics/TextureCollection.DirectX.cs
@@ -12,10 +12,10 @@ void PlatformInit()
 
         internal void ClearTargets(GraphicsDevice device, RenderTargetBinding[] targets)
         {
-            if (_applyToVertexStage && !device.GraphicsCapabilities.SupportsVertexTextures)
+            if (_stage == ShaderStage.Vertex && !device.GraphicsCapabilities.SupportsVertexTextures)
                 return;
 
-            if (_applyToVertexStage)
+            if (_stage == ShaderStage.Vertex)
                 ClearTargets(targets, device._d3dContext.VertexShader);
             else
                 ClearTargets(targets, device._d3dContext.PixelShader);
@@ -59,7 +59,7 @@ void PlatformSetTextures(GraphicsDevice device)
             // NOTE: We make the assumption here that the caller has
             // locked the d3dContext for us to use.
             SharpDX.Direct3D11.CommonShaderStage shaderStage;
-            if (_applyToVertexStage)
+            if (_stage == ShaderStage.Vertex)
                 shaderStage = device._d3dContext.VertexShader;
             else
                 shaderStage = device._d3dContext.PixelShader;

diff --git a/MonoGame.Framework/Platform/WindowsUniversal/UAPGameWindow.cs b/MonoGame.Framework/Platform/WindowsUniversal/UAPGameWindow.cs
@@ -53,6 +53,18 @@ partial class UAPGameWindow : GameWindow
 
         #region Public Properties
 
+        public override Point Position
+        {
+            get
+            {
+                return Point.Zero;
+            }
+
+            set
+            {
+            }
+        }
+
         public override IntPtr Handle { get { return Marshal.GetIUnknownForObject(_coreWindow); } }
 
         public override string ScreenDeviceName { get { return String.Empty; } } // window.Title

diff --git a/MonoGame.Framework/Platform/iOS/iOSGameWindow.cs b/MonoGame.Framework/Platform/iOS/iOSGameWindow.cs
@@ -23,9 +23,21 @@ void HandleInterfaceOrientationChanged (object sender, EventArgs e)
             OnOrientationChanged();
         }
 
-		#region GameWindow Members
+        #region GameWindow Members
 
-		public override bool AllowUserResizing {
+        public override Point Position
+        {
+            get
+            {
+                return Point.Zero;
+            }
+
+            set
+            {
+            }
+        }
+
+        public override bool AllowUserResizing {
 			get { return false; }
 			set { /* Do nothing. */ }
 		}
@@ -120,4 +132,4 @@ protected override void SetTitle (string title)
 
 		#endregion GameWindow Members
 	}
-}
+}