diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-11-06 06:52:24 +0000 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-11-06 06:52:24 +0000 |
| commit | 35e200881c38eb6c1bfd1f14ef440d4bc4da8c74 (patch) | |
| tree | 8fceb759ef8f8259fd574c398ac02965566a05ff /indra/newview/pipeline.cpp | |
| parent | 2f2bdd83d6e078fb6cdcbb0ba0a9eaa38d45cc90 (diff) | |
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index b01a4f5161..17c04a81c2 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1464,6 +1464,7 @@ F32 LLPipeline::calcPixelArea(LLVector3 center, LLVector3 size, LLCamera &camera F32 dist = lookAt.length(); //ramp down distance for nearby objects + //shrink dist by dist/16. if (dist < 16.f) { dist /= 16.f; @@ -3001,15 +3002,6 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) LLAppViewer::instance()->pingMainloopTimeout("Pipeline:ForceVBO"); - //by bao - //fake vertex buffer updating - //to guaranttee at least updating one VBO buffer every frame - //to walk around the bug caused by ATI card --> DEV-3855 - // - if(forceVBOUpdate) - gSky.mVOSkyp->updateDummyVertexBuffer() ; - - // Initialize lots of GL state to "safe" values glMatrixMode(GL_TEXTURE); glLoadIdentity(); |