diff --git a/OpenRA.Renderer.Sdl2/ErrorHandler.cs b/OpenRA.Renderer.Sdl2/ErrorHandler.cs index e3c1b49f7e..6af34a7762 100644 --- a/OpenRA.Renderer.Sdl2/ErrorHandler.cs +++ b/OpenRA.Renderer.Sdl2/ErrorHandler.cs @@ -56,9 +56,12 @@ namespace OpenRA.Renderer.Sdl2 Log.Write("graphics", "Vendor: {0}", GL.GetString(StringName.Vendor)); if (GL.GetString(StringName.Vendor).Contains("Microsoft")) { - Log.Write("graphics", "Note: The default driver provided by Microsoft does not include full OpenGL support.\n" - + "Please install the latest drivers from your graphics card manufacturer's website.\n"); + var msg = ""; + msg += "Note: The default driver provided by Microsoft does not include full OpenGL support.\n"; + msg += "Please install the latest drivers from your graphics card manufacturer's website.\n"; + Log.Write("graphics", msg); } + Log.Write("graphics", "Renderer: {0}", GL.GetString(StringName.Renderer)); Log.Write("graphics", "GL Version: {0}", GL.GetString(StringName.Version)); Log.Write("graphics", "Shader Version: {0}", GL.GetString(StringName.ShadingLanguageVersion)); diff --git a/OpenRA.Renderer.Sdl2/Sdl2GraphicsDevice.cs b/OpenRA.Renderer.Sdl2/Sdl2GraphicsDevice.cs index 084e10073c..dc8ac14999 100755 --- a/OpenRA.Renderer.Sdl2/Sdl2GraphicsDevice.cs +++ b/OpenRA.Renderer.Sdl2/Sdl2GraphicsDevice.cs @@ -157,11 +157,13 @@ namespace OpenRA.Renderer.Sdl2 SDL.SDL_GL_DeleteContext(context); context = IntPtr.Zero; } + if (window != IntPtr.Zero) { SDL.SDL_DestroyWindow(window); window = IntPtr.Zero; } + SDL.SDL_Quit(); } diff --git a/OpenRA.Renderer.Sdl2/Texture.cs b/OpenRA.Renderer.Sdl2/Texture.cs index 3e3ae2bd7a..6daf52db84 100644 --- a/OpenRA.Renderer.Sdl2/Texture.cs +++ b/OpenRA.Renderer.Sdl2/Texture.cs @@ -34,6 +34,7 @@ namespace OpenRA.Renderer.Sdl2 { return scaleFilter; } + set { if (scaleFilter == value)