diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-02-23 20:06:46 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-02-23 20:06:46 +0200 |
| commit | 150faaf53c3b59ff65aaa40a47d6678c741c4eaf (patch) | |
| tree | 356c0404f99c3e0c620a2fed5bad7a162f617233 /indra/newview/lldynamictexture.cpp | |
| parent | d9b09b3868ccc52655c00d547f2e4b849161d966 (diff) | |
Backed out changeset: f1fa95a76b9a
Diffstat (limited to 'indra/newview/lldynamictexture.cpp')
| -rw-r--r-- | indra/newview/lldynamictexture.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index e180d91461..af6977d3cd 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -125,11 +125,17 @@ BOOL LLViewerDynamicTexture::render() //----------------------------------------------------------------------------- void LLViewerDynamicTexture::preRender(BOOL clear_depth) { + // <FS:Beq> changes to support higher resolution rendering in the preview + ////only images up to 512x512 are supported + //llassert(mFullHeight <= 512); + //llassert(mFullWidth <= 512); gPipeline.allocatePhysicsBuffer(); llassert(mFullWidth <= static_cast<S32>(gPipeline.mPhysicsDisplay.getWidth())); llassert(mFullHeight <= static_cast<S32>(gPipeline.mPhysicsDisplay.getHeight())); +// if (gGLManager.mHasFramebufferObject && gPipeline.mWaterDis.isComplete() && !gGLManager.mIsATI) if (gGLManager.mHasFramebufferObject && gPipeline.mPhysicsDisplay.isComplete() && !gGLManager.mIsATI) +// </FS:Beq> { //using offscreen render target, just use the bottom left corner mOrigin.set(0, 0); } @@ -215,13 +221,15 @@ BOOL LLViewerDynamicTexture::updateAllInstances() { return TRUE; } - + // <FS:Beq> changes to support higher resolution rendering in the preview + // bool use_fbo = gGLManager.mHasFramebufferObject && gPipeline.mWaterDis.isComplete() && !gGLManager.mIsATI; bool use_fbo = gGLManager.mHasFramebufferObject && gPipeline.mPhysicsDisplay.isComplete() && !gGLManager.mIsATI; if (use_fbo) { +// gPipeline.mWaterDis.bindTarget(); gPipeline.mPhysicsDisplay.bindTarget(); } - + // </FS:Beq> LLGLSLShader::bindNoShader(); LLVertexBuffer::unbind(); @@ -257,7 +265,10 @@ BOOL LLViewerDynamicTexture::updateAllInstances() if (use_fbo) { + // <FS:Beq> changes to support higher resolution rendering in the preview + // gPipeline.mWaterDis.flush(); gPipeline.mPhysicsDisplay.flush(); + // </FS:Beq> } return ret; |