ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #494 from Armada651/master 

Fix OpenGL video backend when using "render to main" on Windows.
This commit is contained in:
Pierre Bourdon 2014-06-15 17:39:52 +02:00
parent 5a156065d4 f408dc72e7
commit 7f7f5c9d29
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Core/DolphinWX/GLInterface/WGL.cpp
View File

@ -145,32 +145,11 @@ bool cInterfaceWGL::ClearCurrent()
void cInterfaceWGL::Update() void cInterfaceWGL::Update()
{ {
RECT rcWindow; RECT rcWindow;
HWND parent = GetParent((HWND)m_window_handle);
if (!parent)
{
// We are not rendering to a child window - use client size.
GetClientRect((HWND)m_window_handle, &rcWindow); GetClientRect((HWND)m_window_handle, &rcWindow);
}
else
{
// We are rendering to a child window - use parent size.
GetWindowRect(parent, &rcWindow);
}
// Get the new window width and height // Get the new window width and height
// See below for documentation s_backbuffer_width = rcWindow.right - rcWindow.left;
int width = rcWindow.right - rcWindow.left; s_backbuffer_height = rcWindow.bottom - rcWindow.top;
int height = rcWindow.bottom - rcWindow.top;
// If we are rendering to a child window
if (GetParent((HWND)m_window_handle) != 0 &&
(s_backbuffer_width != width || s_backbuffer_height != height) &&
width >= 4 && height >= 4)
{
::MoveWindow((HWND)m_window_handle, 0, 0, width, height, FALSE);
s_backbuffer_width = width;
s_backbuffer_height = height;
}
} }
// Close backend // Close backend