diff options
author | JJ Linden <jj@lindenlab.com> | 2013-09-30 15:41:51 -0700 |
---|---|---|
committer | JJ Linden <jj@lindenlab.com> | 2013-09-30 15:41:51 -0700 |
commit | a6c20ae524610de2f8681cff8353d062a69b923e (patch) | |
tree | 929e4a253e4b83ca7e07543916e709d50fdf855e /indra/newview/pipeline.h | |
parent | 6c13c4dd552a05cf055a90bdd90937de9f3903a5 (diff) | |
parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) |
merging
Diffstat (limited to 'indra/newview/pipeline.h')
-rwxr-xr-x | indra/newview/pipeline.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index f0bebbe20d..fbbcf8f06d 100755 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -295,7 +295,8 @@ public: void unbindDeferredShader(LLGLSLShader& shader); void renderDeferredLighting(); - + void renderDeferredLightingToRT(LLRenderTarget* target); + void generateWaterReflection(LLCamera& camera); void generateSunShadow(LLCamera& camera); void generateHighlight(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; |