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

Move shader source code length adjustment to the main compilation routine

Browse Source
This commit is contained in:
Wojtek Figat
2021-01-05 14:25:38 +01:00
parent 6adb489276
commit 336a3bd484
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/ShadersCompilation/ShadersCompilation.cpp
View File

@@ -60,7 +60,7 @@ public:
ShadersCompilationService ShadersCompilationServiceInstance;
bool ShadersCompilation::Compile(const ShaderCompilationOptions& options)
bool ShadersCompilation::Compile(ShaderCompilationOptions& options)
{
PROFILE_CPU_NAMED("Shader.Compile");
@@ -86,6 +86,10 @@ bool ShadersCompilation::Compile(const ShaderCompilationOptions& options)
return true;
}
// Adjust input source length if it ends with null
while (options.SourceLength > 2 && options.Source[options.SourceLength - 1] == 0)
options.SourceLength--;
const DateTime startTime = DateTime::NowUTC();
const FeatureLevel featureLevel = RenderTools::GetFeatureLevel(options.Profile);

2
Source/Engine/ShadersCompilation/ShadersCompilation.h
View File

@@ -20,7 +20,7 @@ public:
/// </summary>
/// <param name="options">Compilation options</param>
/// <returns>True if failed, otherwise false</returns>
static bool Compile(const ShaderCompilationOptions& options);
static bool Compile(ShaderCompilationOptions& options);
/// <summary>
/// Registers shader asset for the automated reloads on source includes changes.