mirror of
https://github.com/OpenMW/openmw.git
synced 2025-11-09 19:26:39 +00:00
Merge branch 'gen_mipmaps_after_draw' into 'master'
Generate mipmaps after we draw fullscreen geometry See merge request OpenMW/openmw!4768
This commit is contained in:
commit
f64f53341b
1 changed files with 9 additions and 9 deletions
|
|
@ -280,15 +280,6 @@ namespace MWRender
|
||||||
{
|
{
|
||||||
pass.mRenderTarget->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
|
pass.mRenderTarget->apply(state, osg::FrameBufferObject::DRAW_FRAMEBUFFER);
|
||||||
|
|
||||||
if (pass.mRenderTexture->getNumMipmapLevels() > 0)
|
|
||||||
{
|
|
||||||
state.setActiveTextureUnit(0);
|
|
||||||
state.applyTextureAttribute(0,
|
|
||||||
pass.mRenderTarget->getAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0)
|
|
||||||
.getTexture());
|
|
||||||
ext->glGenerateMipmap(GL_TEXTURE_2D);
|
|
||||||
}
|
|
||||||
|
|
||||||
lastApplied = pass.mRenderTarget->getHandle(state.getContextID());
|
lastApplied = pass.mRenderTarget->getHandle(state.getContextID());
|
||||||
}
|
}
|
||||||
else if (pass.mResolve && index == filtered.back())
|
else if (pass.mResolve && index == filtered.back())
|
||||||
|
|
@ -325,6 +316,15 @@ namespace MWRender
|
||||||
|
|
||||||
drawGeometry(renderInfo);
|
drawGeometry(renderInfo);
|
||||||
|
|
||||||
|
if (pass.mRenderTarget && pass.mRenderTexture->getNumMipmapLevels() > 0)
|
||||||
|
{
|
||||||
|
state.setActiveTextureUnit(0);
|
||||||
|
state.applyTextureAttribute(0,
|
||||||
|
pass.mRenderTarget->getAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0)
|
||||||
|
.getTexture());
|
||||||
|
ext->glGenerateMipmap(GL_TEXTURE_2D);
|
||||||
|
}
|
||||||
|
|
||||||
state.popStateSet();
|
state.popStateSet();
|
||||||
state.apply();
|
state.apply();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue