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

Fix material to run shader generation when using null rendering backend

Browse Source
This commit is contained in:
Wojtek Figat
2025-01-21 23:14:00 +01:00
parent 8736d4c91a
commit 4cf22c3a1f
1 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Source/Engine/Content/Assets/Material.cpp
View File

@@ -138,36 +138,6 @@ Asset::LoadResult Material::load()
}
#undef IS_GPU_NOT_READY
// Special case for Null renderer
if (IsNullRenderer())
{
// Hack loading
MemoryReadStream shaderCacheStream(nullptr, 0);
_materialShader = MaterialShader::CreateDummy(shaderCacheStream, _shaderHeader.Material.Info);
if (_materialShader == nullptr)
{
LOG(Warning, "Cannot load material.");
return LoadResult::Failed;
}
materialParamsChunk = GetChunk(SHADER_FILE_CHUNK_MATERIAL_PARAMS);
if (materialParamsChunk != nullptr && materialParamsChunk->IsLoaded())
{
MemoryReadStream materialParamsStream(materialParamsChunk->Get(), materialParamsChunk->Size());
if (Params.Load(&materialParamsStream))
{
LOG(Warning, "Cannot load material parameters.");
return LoadResult::Failed;
}
}
else
{
// Don't use parameters
Params.Dispose();
}
ParamsChanged();
return LoadResult::Ok;
}
// If engine was compiled with shaders compiling service:
// - Material should be changed in need to convert it to the newer version (via Visject Surface)
// Shader should be recompiled if shader source code has been modified
@@ -320,7 +290,12 @@ Asset::LoadResult Material::load()
// Load shader cache (it may call compilation or gather cached data)
ShaderCacheResult shaderCache;
if (LoadShaderCache(shaderCache))
if (IsNullRenderer())
{
MemoryReadStream shaderCacheStream(nullptr, 0);
_materialShader = MaterialShader::CreateDummy(shaderCacheStream, _shaderHeader.Material.Info);
}
else if (LoadShaderCache(shaderCache))
{
LOG(Error, "Cannot load \'{0}\' shader cache.", ToString());
#if 1