ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Move final blit in renderGLSL instead of pp"

Browse Source 
This reverts commit 16d87cf820.
This commit is contained in:
Vincent Lejeune
2014-01-25 00:22:44 +01:00
parent 16d87cf820
commit c7b2f82e8f
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/graphics/post_processing.cpp
View File

@@ -275,7 +275,8 @@ void renderPPDisplace(ITexture *in)
glDisable(GL_BLEND);
}
void PostProcessing::renderColorLevel(ITexture *in)
static
void renderColorLevel(ITexture *in)
{
core::vector3df m_inlevel = World::getWorld()->getTrack()->getColorLevelIn();
core::vector2df m_outlevel = World::getWorld()->getTrack()->getColorLevelOut();
@@ -874,6 +875,18 @@ void PostProcessing::render()
glDisable(GL_STENCIL_TEST);
PROFILER_POP_CPU_MARKER();
}
// Final blit
// TODO : Use glBlitFramebuffer
drv->setRenderTarget(ERT_FRAME_BUFFER, false, false);
if (irr_driver->getNormals())
renderPassThrough(irr_driver->getRTT(RTT_NORMAL_AND_DEPTH));
else if (irr_driver->getSSAOViz())
renderPassThrough(irr_driver->getRTT(RTT_SSAO));
else if (irr_driver->getShadowViz())
renderPassThrough(irr_driver->getRTT(RTT_SHADOW));
else
renderColorLevel(in);
}
} // render

2
src/graphics/post_processing.hpp
View File

@@ -87,7 +87,7 @@ public:
/** Render tex. Used for blit/texture resize */
void renderPassThrough(video::ITexture *tex);
void renderColorLevel(video::ITexture *in);
void renderGlow(video::ITexture *tex);
/** Render the post-processed scene */

12
src/graphics/render.cpp
View File

@@ -334,18 +334,6 @@ void IrrDriver::renderGLSL(float dt)
m_post_processing->render();
PROFILER_POP_CPU_MARKER();
// Final blit
// TODO : Use glBlitFramebuffer
m_video_driver->setRenderTarget(ERT_FRAME_BUFFER, false, false);
if (irr_driver->getNormals())
m_post_processing->renderPassThrough(irr_driver->getRTT(RTT_NORMAL_AND_DEPTH));
else if (irr_driver->getSSAOViz())
m_post_processing->renderPassThrough(irr_driver->getRTT(RTT_SSAO));
else if (irr_driver->getShadowViz())
m_post_processing->renderPassThrough(irr_driver->getRTT(RTT_SHADOW));
else
m_post_processing->renderColorLevel(irr_driver->getRTT(RTT_TMP1));
// Set the viewport back to the full screen for race gui
m_video_driver->setViewPort(core::recti(0, 0,
UserConfigParams::m_width,