aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lldrawpooltree.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lldrawpooltree.cpp')
-rw-r--r--linden/indra/newview/lldrawpooltree.cpp15
1 files changed, 11 insertions, 4 deletions
diff --git a/linden/indra/newview/lldrawpooltree.cpp b/linden/indra/newview/lldrawpooltree.cpp
index e4560f2..52f669a 100644
--- a/linden/indra/newview/lldrawpooltree.cpp
+++ b/linden/indra/newview/lldrawpooltree.cpp
@@ -52,7 +52,7 @@ LLDrawPoolTree::LLDrawPoolTree(LLViewerImage *texturep) :
52 LLFacePool(POOL_TREE), 52 LLFacePool(POOL_TREE),
53 mTexturep(texturep) 53 mTexturep(texturep)
54{ 54{
55 gGL.getTexUnit(0)->bind(mTexturep.get()); 55// gGL.getTexUnit(0)->bind(mTexturep.get());
56 mTexturep->setAddressMode(LLTexUnit::TAM_WRAP); 56 mTexturep->setAddressMode(LLTexUnit::TAM_WRAP);
57} 57}
58 58
@@ -110,7 +110,7 @@ void LLDrawPoolTree::render(S32 pass)
110 } 110 }
111 else 111 else
112 { 112 {
113 gGL.getTexUnit(sDiffTex)->bind(mTexturep); 113 gGL.getTexUnit(sDiffTex)->bind(mTexturep, TRUE);
114 114
115 for (std::vector<LLFace*>::iterator iter = mDrawFace.begin(); 115 for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
116 iter != mDrawFace.end(); iter++) 116 iter != mDrawFace.end(); iter++)
@@ -140,7 +140,7 @@ void LLDrawPoolTree::endRenderPass(S32 pass)
140void LLDrawPoolTree::beginDeferredPass(S32 pass) 140void LLDrawPoolTree::beginDeferredPass(S32 pass)
141{ 141{
142 LLFastTimer t(LLFastTimer::FTM_RENDER_TREES); 142 LLFastTimer t(LLFastTimer::FTM_RENDER_TREES);
143 gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f); 143 gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f); // KL Render-pipeline has this set at 0.f ... NOOOOOO! make shitty trees :)
144 144
145 shader = &gDeferredTreeProgram; 145 shader = &gDeferredTreeProgram;
146 shader->bind(); 146 shader->bind();
@@ -166,6 +166,9 @@ void LLDrawPoolTree::beginShadowPass(S32 pass)
166{ 166{
167 LLFastTimer t(LLFastTimer::FTM_SHADOW_TREE); 167 LLFastTimer t(LLFastTimer::FTM_SHADOW_TREE);
168 gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f); 168 gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f);
169 glPolygonOffset(gSavedSettings.getF32("RenderDeferredTreeShadowOffset"),
170 gSavedSettings.getF32("RenderDeferredTreeShadowBias"));
171
169 gDeferredShadowProgram.bind(); 172 gDeferredShadowProgram.bind();
170} 173}
171 174
@@ -178,7 +181,11 @@ void LLDrawPoolTree::endShadowPass(S32 pass)
178{ 181{
179 LLFastTimer t(LLFastTimer::FTM_SHADOW_TREE); 182 LLFastTimer t(LLFastTimer::FTM_SHADOW_TREE);
180 gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT); 183 gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
181 gDeferredShadowProgram.unbind(); 184
185 glPolygonOffset(gSavedSettings.getF32("RenderDeferredSpotShadowOffset"),
186 gSavedSettings.getF32("RenderDeferredSpotShadowBias"));
187
188 //gDeferredShadowProgram.unbind();
182} 189}
183 190
184 191