livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-9806 stop rendering stars post deferred so they can be depth sorted properly with clouds and heavenly bodies.

meow-7.2.2
Graham Linden 2018-11-02 17:30:54 +01:00
parent e529da6ba7
commit 3494fa3cfe
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/lldrawpoolwlsky.cpp
View File

@ -704,12 +704,14 @@ void LLDrawPoolWLSky::renderDeferred(S32 pass)
if (gPipeline.useAdvancedAtmospherics())
{
renderSkyHazeAdvanced(origin, camHeightLocal);
renderStarsDeferred();
renderHeavenlyBodies();
renderSkyCloudsAdvanced(origin, camHeightLocal, cloud_shader);
}
else
{
renderSkyHazeDeferred(origin, camHeightLocal);
renderStarsDeferred();
renderHeavenlyBodies();
renderSkyCloudsDeferred(origin, camHeightLocal, cloud_shader);
}
@ -718,18 +720,6 @@ void LLDrawPoolWLSky::renderDeferred(S32 pass)
gGL.setColorMask(true, true);
}
void LLDrawPoolWLSky::renderPostDeferred(S32 pass)
{
LLVector3 const & origin = LLViewerCamera::getInstance()->getOrigin();
LLGLSPipelineBlendSkyBox sky(true, false);
gGL.pushMatrix();
gGL.translatef(origin.mV[0], origin.mV[1], origin.mV[2]);
renderStarsDeferred();
gGL.popMatrix();
}
void LLDrawPoolWLSky::render(S32 pass)
{
if (!gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_SKY))

4
indra/newview/lldrawpoolwlsky.h
View File

@ -53,10 +53,10 @@ public:
/*virtual*/ void renderDeferred(S32 pass);
/*virtual*/ S32 getNumPostDeferredPasses() { return 1; }
/*virtual*/ S32 getNumPostDeferredPasses() { return 0; }
/*virtual*/ void beginPostDeferredPass(S32 pass) {}
/*virtual*/ void endPostDeferredPass(S32 pass) {}
/*virtual*/ void renderPostDeferred(S32 pass);
/*virtual*/ void renderPostDeferred(S32 pass) {}
/*virtual*/ LLViewerTexture *getDebugTexture();
/*virtual*/ void beginRenderPass( S32 pass );