summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/render/drawogl.c
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-10-20 21:34:36 +0200
committer ImJezze <jezze@gmx.net>2015-10-20 21:34:36 +0200
commita7b8acbe3eebcf17367baa642375cfa47ae4ea85 (patch)
tree854b859d6176802c0278f4b00de3f7c774e02dda /src/osd/modules/render/drawogl.c
parent4610935e796661874bb4ee7ec6536d9423aeb7be (diff)
parent74aae76c4e3e257f99d139c4febb5d86d1419e50 (diff)
Merge pull request #6 from mamedev/master
Sync to base master
Diffstat (limited to 'src/osd/modules/render/drawogl.c')
-rw-r--r--src/osd/modules/render/drawogl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/osd/modules/render/drawogl.c b/src/osd/modules/render/drawogl.c
index f071428972f..5a139c4054b 100644
--- a/src/osd/modules/render/drawogl.c
+++ b/src/osd/modules/render/drawogl.c
@@ -3117,7 +3117,8 @@ void sdl_info_ogl::texture_mpass_flip(ogl_texture_info *texture, int shaderIdx)
GL_CHECK_ERROR_NORMAL();
glViewport(0.0, 0.0, (GLsizei)texture->rawwidth, (GLsizei)texture->rawheight);
}
- else if ( shaderIdx==m_glsl_program_mb2sc )
+
+ if ( shaderIdx==m_glsl_program_mb2sc )
{
assert ( m_glsl_program_mb2sc < m_glsl_program_num-1 );
glPopAttrib(); // glViewport(0.0, 0.0, (GLsizei)window().width, (GLsizei)window().height)