diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-02-08 15:34:01 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-08 15:34:01 -0600 |
| commit | ba9bae05706982f982df8d615a28ac9c7c3c51fe (patch) | |
| tree | 4b688dcb22e6c65c7c8edde6e5a0d649ecd3751c /indra/newview/llviewershadermgr.h | |
| parent | 4f6e3acece507b8be66b76db5609bdaec41307d4 (diff) | |
| parent | c3d4f571aa5522e3028842c6d7caa977819a7393 (diff) | |
Merge pull request #715 from secondlife/materials_featurette/mirrors
Mirrors pre-release
Diffstat (limited to 'indra/newview/llviewershadermgr.h')
| -rw-r--r-- | indra/newview/llviewershadermgr.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h index 824c66ab49..57fc66ce0d 100644 --- a/indra/newview/llviewershadermgr.h +++ b/indra/newview/llviewershadermgr.h @@ -41,6 +41,10 @@ public: LLViewerShaderMgr(); /* virtual */ ~LLViewerShaderMgr(); + // Add shaders to mShaderList for later uniform propagation + // Will assert on redundant shader entries in debug builds + void finalizeShaderList(); + // singleton pattern implementation static LLViewerShaderMgr * instance(); static void releaseInstance(); @@ -153,6 +157,7 @@ extern LLGLSLShader gGlowCombineProgram; extern LLGLSLShader gReflectionMipProgram; extern LLGLSLShader gGaussianProgram; extern LLGLSLShader gRadianceGenProgram; +extern LLGLSLShader gHeroRadianceGenProgram; extern LLGLSLShader gIrradianceGenProgram; extern LLGLSLShader gGlowCombineFXAAProgram; extern LLGLSLShader gDebugProgram; @@ -179,7 +184,6 @@ extern LLGLSLShader gOneTextureFilterProgram; //object shaders extern LLGLSLShader gObjectPreviewProgram; extern LLGLSLShader gPhysicsPreviewProgram; -extern LLGLSLShader gSkinnedObjectFullbrightAlphaMaskProgram; extern LLGLSLShader gObjectBumpProgram; extern LLGLSLShader gSkinnedObjectBumpProgram; extern LLGLSLShader gObjectAlphaMaskNoColorProgram; |