Merge pull request #544 from dellis1972/develop

Fix to stop the flickering on the emulator when using gles 1.1
MonoGame · Jun 20, 2012 · 4952f59 · 4952f59
2 parents 6529eae + 2394f57
commit 4952f59
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/MonoGame.Framework/Android/AndroidGamePlatform.cs b/MonoGame.Framework/Android/AndroidGamePlatform.cs
@@ -80,7 +80,9 @@ 1. Definitions
 
 using Microsoft.Xna.Framework.Input;
 using Microsoft.Xna.Framework.Audio;
-using Microsoft.Xna.Framework.Media;
+using Microsoft.Xna.Framework.Media;
+
+using GL11 = OpenTK.Graphics.ES11.GL;
 
 namespace Microsoft.Xna.Framework
 {
@@ -95,9 +97,13 @@ public AndroidGamePlatform(Game game)
             AndroidGameActivity.Resumed += Activity_Resumed;
 
             Window = new AndroidGameWindow(Game.Activity, game);
+
+			string model = Android.OS.Build.Model;
+			runningOnEmulator = string.IsNullOrEmpty(model) ? false : model.Contains("sdk");
         }
 
         private bool _initialized;
+		private bool runningOnEmulator = false;
         public static bool IsPlayingVdeo { get; set; }
 
         public override void Exit()
@@ -230,8 +236,22 @@ public override void ResetElapsedTime ()
         public override void Present()
         {
             try
-            {
-                Window.SwapBuffers();
+            {
+				if (this.Window.GLContextVersion == OpenTK.Graphics.GLContextVersion.Gles2_0)
+				{
+					Window.SwapBuffers();
+				}
+				else
+				{
+					if (!runningOnEmulator)
+					{
+						Window.SwapBuffers();
+					}
+					else
+					{
+					   GL11.Flush();
+					}
+				}
             }
             catch (Exception ex)
             {