Merge branch 'master' of https://github.com/supertuxkart/stk-code
This commit is contained in:
commit
1de0e50607
@ -161,9 +161,10 @@ void IrrDriver::renderLights(unsigned pointlightcount)
|
|||||||
m_post_processing->renderGI(rh_matrix, rh_extend, m_rtts->getRH().getRTT()[0], m_rtts->getRH().getRTT()[1], m_rtts->getRH().getRTT()[2]);
|
m_post_processing->renderGI(rh_matrix, rh_extend, m_rtts->getRH().getRTT()[0], m_rtts->getRH().getRTT()[1], m_rtts->getRH().getRTT()[2]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
ScopedGPUTimer timer(irr_driver->getGPUTimer(Q_ENVMAP));
|
ScopedGPUTimer timer(irr_driver->getGPUTimer(Q_ENVMAP));
|
||||||
m_post_processing->renderDiffuseEnvMap(blueSHCoeff, greenSHCoeff, redSHCoeff);
|
m_post_processing->renderDiffuseEnvMap(blueSHCoeff, greenSHCoeff, redSHCoeff);
|
||||||
|
}
|
||||||
|
|
||||||
m_rtts->getFBO(FBO_COMBINED_TMP1_TMP2).Bind();
|
m_rtts->getFBO(FBO_COMBINED_TMP1_TMP2).Bind();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user