diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-09-03 19:09:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-03 19:09:48 +0300 |
| commit | 5593cde0e85d4d4b06efacffb6f00ed2fadb188a (patch) | |
| tree | 185c46ee176b3f4196eaeb0d56e1d72931e72966 /indra/llrender/llshadermgr.h | |
| parent | 3e4f112c03d4fb9f5483d4acf18f0654740ebf45 (diff) | |
| parent | 46f325b7db41ac855d35e3ab50ad915dd075de1e (diff) | |
Merge pull request #4625 from secondlife/andreyk/viewer_4587
#4587 Shaders sometimes do not match the shader settings
Diffstat (limited to 'indra/llrender/llshadermgr.h')
| -rw-r--r-- | indra/llrender/llshadermgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 46788841a5..1b638e6e06 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -363,7 +363,7 @@ public: // Implemented in the application to actually update out of date uniforms for a particular shader virtual void updateShaderUniforms(LLGLSLShader * shader) = 0; // Pure Virtual - void initShaderCache(bool enabled, const LLUUID& old_cache_version, const LLUUID& current_cache_version); + void initShaderCache(bool enabled, const LLUUID& old_cache_version, const LLUUID& current_cache_version, bool second_instance); void clearShaderCache(); void persistShaderCacheMetadata(); @@ -387,7 +387,7 @@ public: F32 mLastUsedTime = 0.0; }; std::map<LLUUID, ProgramBinaryData> mShaderBinaryCache; - bool mShaderCacheInitialized = false; + LLUUID mShaderCacheVersion; bool mShaderCacheEnabled = false; std::string mShaderCacheDir; |