GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Wojciech Figat
2022-05-02 10:36:31 +02:00
parent 8e02d449fb
commit 04a7dab7e7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Engine/ShadersCompilation/ShaderCompiler.cpp
View File

@@ -25,7 +25,7 @@ namespace IncludedFiles
{
String Path;
DateTime LastEditTime;
Array<byte> Source;
StringAnsi Source;
};
CriticalSection Locker;
@@ -222,7 +222,7 @@ bool ShaderCompiler::GetIncludedFileSource(ShaderCompilationContext* context, co
result = New<IncludedFiles::File>();
result->Path = path;
result->LastEditTime = FileSystem::GetFileLastEditTime(path);
if (File::ReadAllBytes(result->Path, result->Source))
if (File::ReadAllText(result->Path, result->Source))
{
LOG(Error, "Failed to load shader source file '{0}' included in '{1}' (path: '{2}')", String(includedFile), String(sourceFile), path);
Delete(result);
@@ -234,8 +234,8 @@ bool ShaderCompiler::GetIncludedFileSource(ShaderCompilationContext* context, co
context->Includes.Add(path);
// Copy to output
source = (const char*)result->Source.Get();
sourceLength = result->Source.Count() - 1;
source = result->Source.Get();
sourceLength = result->Source.Length();
return false;
}