Skip to content

p#388 Improve protections and loggiong around shader cache saving #5957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akleshchev merged 1 commit into from
Jun 26, 2026
+30 −2
Merged

p#388 Improve protections and loggiong around shader cache saving #5957

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions indra/llrender/llshadermgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,14 @@ void LLShaderMgr::persistShaderCacheMetadata()
return;
}

LL_INFOS("ShaderMgr") << "Persisting shader cache metadata to disk" << LL_ENDL;
if (mShaderCacheDir.empty() || !LLFile::isdir(mShaderCacheDir))
{
LL_WARNS("ShaderMgr") << "Invalid shader cache directory: " << mShaderCacheDir << LL_ENDL;
return;
}

size_t total_entries = mShaderBinaryCache.size();
LL_INFOS("ShaderMgr") << "Persisting shader " << (S32)total_entries << " cache metadata entries to disk" << LL_ENDL;
Comment thread
akleshchev marked this conversation as resolved.

LLSD out;
// Settings and shader cache get saved at different time, thus making
Expand All @@ -1098,6 +1105,8 @@ void LLShaderMgr::persistShaderCacheMetadata()
out["shaders"] = LLSD::emptyMap();
LLSD &shaders = out["shaders"];

size_t removed = 0;

static const F32 LRU_TIME = (60.f * 60.f) * 24.f * 7.f; // 14 days
const F32 current_time = (F32)LLTimer::getTotalSeconds();
for (auto it = mShaderBinaryCache.begin(); it != mShaderBinaryCache.end();)
Expand All @@ -1106,8 +1115,9 @@ void LLShaderMgr::persistShaderCacheMetadata()
if ((shader_metadata.mLastUsedTime + LRU_TIME) < current_time)
{
std::string shader_path = gDirUtilp->add(mShaderCacheDir, it->first.asString() + ".shaderbin");
LLFile::remove(shader_path);
LLFile::remove(shader_path, ENOENT);
it = mShaderBinaryCache.erase(it);
removed++;
}
else
{
Expand All @@ -1121,14 +1131,32 @@ void LLShaderMgr::persistShaderCacheMetadata()
}

std::string meta_out_path = gDirUtilp->add(mShaderCacheDir, "shaderdata.llsd");
if (shaders.size() == 0)
{
LL_WARNS("ShaderMgr") << "No shader cache entries to persist, removing cache metadata file" << LL_ENDL;
LLFile::remove(meta_out_path);
return;
}

llofstream outstream(meta_out_path, std::ios_base::out | std::ios_base::binary);
if (!outstream.is_open())
{
LL_WARNS("ShaderMgr") << "Failed to open file. Unable to save shader cache to: " << mShaderCacheDir << LL_ENDL;
return;
}

LLSDSerialize::toBinary(out, outstream);
if (outstream.fail())
{
LL_WARNS("ShaderMgr") << "Failed to serialize shader cache metadata" << LL_ENDL;
outstream.close();
LLFile::remove(meta_out_path); // Clean up partial write
return;
}
outstream.close();

LL_INFOS("ShaderMgr") << "Persisted " << (S32)shaders.size()
<< " entries. Removed " << (S32)removed << " entries." << LL_ENDL;
}

bool LLShaderMgr::loadCachedProgramBinary(LLGLSLShader* shader)
Expand Down
Loading