diff options
author | Oz Linden <oz@lindenlab.com> | 2013-10-23 13:05:59 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-10-23 13:05:59 -0400 |
commit | c9775dde6249582f0e8976be15e72bfebc4ac3fc (patch) | |
tree | 83407157dae234db649dfff763e68f6e3c843335 /indra/newview/pipeline.h | |
parent | 1a72325ef1e8c798066d8ef7f82acd08d60fb68c (diff) | |
parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) |
merge up to 3.6.9-release
Diffstat (limited to 'indra/newview/pipeline.h')
-rwxr-xr-x | indra/newview/pipeline.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index f0bebbe20d..9aeb2d4978 100755 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -295,6 +295,7 @@ public: void unbindDeferredShader(LLGLSLShader& shader); void renderDeferredLighting(); + void renderDeferredLightingToRT(LLRenderTarget* target); void generateWaterReflection(LLCamera& camera); void generateSunShadow(LLCamera& camera); @@ -594,6 +595,7 @@ public: static BOOL sPickAvatar; static BOOL sReflectionRender; static BOOL sImpostorRender; + static BOOL sImpostorRenderAlphaDepthPass; static BOOL sUnderWaterRender; static BOOL sRenderGlow; static BOOL sTextureBindTest; |