epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix shader loading

Browse Source 
Also remove now redundant mounting of the game directory
This commit is contained in:
Pavel Penev
2015-10-09 14:19:07 +03:00
parent 1b88d24cfa
commit 4ce1444c6b
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/Game.cs
View File

@@ -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)
{

8
OpenRA.Platforms.Default/Shader.cs
View File

@@ -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();