From 4ce1444c6b82f2141da2ca2b645ec16619859aae Mon Sep 17 00:00:00 2001
From: Pavel Penev <penev92@gmail.com>
Date: Fri, 9 Oct 2015 14:19:07 +0300
Subject: [PATCH] Fix shader loading

Also remove now redundant mounting of the game directory
---
 OpenRA.Game/Game.cs                | 1 -
 OpenRA.Platforms.Default/Shader.cs | 8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index 82168de84b..9d17c53d1a 100644
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -218,7 +218,6 @@ namespace OpenRA
 
 			GeoIP.Initialize();
 
-			ModData.ModFiles.Mount(Platform.GameDir); // Needed to access shaders
 			var renderers = new[] { Settings.Graphics.Renderer, "Default", null };
 			foreach (var r in renderers)
 			{
diff --git a/OpenRA.Platforms.Default/Shader.cs b/OpenRA.Platforms.Default/Shader.cs
index 87b5ae33b5..840a5d2b8d 100644
--- a/OpenRA.Platforms.Default/Shader.cs
+++ b/OpenRA.Platforms.Default/Shader.cs
@@ -24,11 +24,9 @@ namespace OpenRA.Platforms.Default
 
 		protected int CompileShaderObject(ShaderType type, string name)
 		{
-			string ext = type == ShaderType.VertexShader ? "vert" : "frag";
-			string filename = "glsl{0}{1}.{2}".F(Path.DirectorySeparatorChar, name, ext);
-			string code;
-			using (var file = new StreamReader(Game.ModData.ModFiles.Open(filename)))
-				code = file.ReadToEnd();
+			var ext = type == ShaderType.VertexShader ? "vert" : "frag";
+			var filename = "glsl{0}{1}.{2}".F(Path.DirectorySeparatorChar, name, ext);
+			var code = File.ReadAllText(filename);
 
 			var shader = GL.CreateShader(type);
 			ErrorHandler.CheckGlError();