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

Moved calls to glEnable from MovelViewWidget to the graphics engine

Browse Source
This commit is contained in:
Elderme
2016-01-17 15:09:45 +01:00
parent e9087a7dd6
commit 585f94d717
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/graphics/render_target.cpp
View File

@@ -88,14 +88,13 @@ void GL1RenderTarget::draw2DImage(const irr::core::rect<s32>& dest_rect,
const irr::core::rect<s32>* clip_rect,
const irr::video::SColor &colors,
bool use_alpha_channel_of_texture) const
{
{
irr::core::rect<s32> source_rect(irr::core::position2di(0, 0),
m_render_target_texture->getSize());
irr_driver->getVideoDriver()->draw2DImage(m_render_target_texture,
dest_rect, source_rect,
clip_rect, &colors,
use_alpha_channel_of_texture);
use_alpha_channel_of_texture);
}
//-----------------------------------------------------------------------------
@@ -151,8 +150,10 @@ void GL3RenderTarget::draw2DImage(const irr::core::rect<s32>& dest_rect,
{
irr::core::rect<s32> source_rect(0, 0, m_frame_buffer->getWidth(),
m_frame_buffer->getHeight());
glEnable(GL_FRAMEBUFFER_SRGB);
draw2DImageFromRTT(m_texture_id,
m_frame_buffer->getWidth(), m_frame_buffer->getHeight(),
dest_rect, source_rect,
clip_rect, colors, use_alpha_channel_of_texture);
clip_rect, colors, use_alpha_channel_of_texture);
glDisable(GL_FRAMEBUFFER_SRGB);
}

2
src/guiengine/widgets/model_view_widget.cpp
View File

@@ -310,8 +310,6 @@ void ModelViewWidget::clearRttProvider()
void ModelViewWidget::drawRTTScene(const irr::core::rect<s32>& dest_rect) const
{
glEnable(GL_FRAMEBUFFER_SRGB);
m_render_target->draw2DImage(dest_rect, NULL, video::SColor(255, 255, 255, 255), true);
glDisable(GL_FRAMEBUFFER_SRGB);
}