diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-05-06 18:09:03 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-06 18:09:03 +0000 |
| commit | 068da0b5655fc3c735cd8019ab3b6bb0defec4c0 (patch) | |
| tree | 143580a4ff29c4c4df91c41e1429add4abaa3f87 /indra/newview/pipeline.cpp | |
| parent | eb14fece837683ebc58540d7f10eb74f5a5fbd4e (diff) | |
merge release-QAR-511 Viewer 1.20 RC 5
merge Branch_1-20-Viewer -r 85828 : 86279 -> release
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 69f2a4c4b7..4f71e33af5 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1162,8 +1162,7 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl !hasRenderType(LLPipeline::RENDER_TYPE_HUD) && !sReflectionRender && gPipeline.canUseVertexShaders() && - sRenderGlow && - gGLManager.mHasFramebufferObject; + sRenderGlow; if (to_texture) { @@ -1243,7 +1242,7 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl if (to_texture) { mScreen.flush(); - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); + LLRenderTarget::unbindTarget(); } else if (LLPipeline::sUseOcclusion > 1) { @@ -2258,6 +2257,8 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) glEnableClientState(GL_VERTEX_ARRAY); + LLVertexBuffer::unbind(); + // Do verification of GL state #ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); @@ -4462,8 +4463,7 @@ void LLPipeline::bindScreenToTexture() void LLPipeline::renderBloom(BOOL for_snapshot) { if (!(gPipeline.canUseVertexShaders() && - sRenderGlow && - gGLManager.mHasFramebufferObject)) + sRenderGlow)) { return; } @@ -4862,6 +4862,8 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) { if (LLPipeline::sWaterReflections && assertInitialized() && LLDrawPoolWater::sNeedsReflectionUpdate) { + LLVertexBuffer::unbind(); + #ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); @@ -5039,7 +5041,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) } last_update = LLDrawPoolWater::sNeedsReflectionUpdate && LLDrawPoolWater::sNeedsDistortionUpdate; - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); + LLRenderTarget::unbindTarget(); LLPipeline::sReflectionRender = FALSE; if (!LLRenderTarget::sUseFBO) |