diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-26 10:17:41 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-26 10:17:41 -0800 |
| commit | 71a660e0060b9aa2c5c01fd94e8070075b373d8d (patch) | |
| tree | 71c42c85a20b4d9a34498267ffcbf05ea8312426 /indra/llrender/llshadermgr.cpp | |
| parent | 041aaf8ea9ac2a15eb5dacc58d25191e56a7c924 (diff) | |
* Fixed up shader compilation errors to get lighting and shadows working again on Mac.
* Cleaned up vertex buffer allocation to guarantee allocation and deallocation using the same allocation methods from the same pools.
* Added new shader feature for atmospheric helpers in the absence of lighting.
Reviewed by davep.
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 1a03aeebb7..908443e8cf 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -94,13 +94,16 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader) } } - if (features->calculatesLighting) + if (features->calculatesLighting || features->atmosphericHelpers) { if (!shader->attachObject("windlight/atmosphericsHelpersV.glsl")) { return FALSE; } + } + if (features->calculatesLighting) + { if (features->isSpecular) { if (!shader->attachObject("lighting/lightFuncSpecularV.glsl")) |