Merge branch 'master' of github.com:bkaradzic/bgfx

This commit is contained in:
Branimir Karadžić 2015-10-06 15:28:02 -07:00
commit 1bca8a29ac
3 changed files with 7 additions and 28 deletions

View file

@ -530,7 +530,7 @@ namespace entry
, msg->m_y , msg->m_y
, msg->m_width , msg->m_width
, msg->m_height , msg->m_height
, m_hwnd[0] , NULL
, NULL , NULL
, (HINSTANCE)GetModuleHandle(NULL) , (HINSTANCE)GetModuleHandle(NULL)
, 0 , 0
@ -914,33 +914,6 @@ namespace entry
top = newrect.top +(newrect.bottom-newrect.top-height)/2; top = newrect.top +(newrect.bottom-newrect.top-height)/2;
} }
HWND parent = GetWindow(_hwnd, GW_OWNER);
if (NULL != parent)
{
if (_windowFrame)
{
SetWindowPos(parent
, HWND_TOP
, -32000
, -32000
, 0
, 0
, SWP_SHOWWINDOW
);
}
else
{
SetWindowPos(parent
, HWND_TOP
, newrect.left
, newrect.top
, newrect.right-newrect.left
, newrect.bottom-newrect.top
, SWP_SHOWWINDOW
);
}
}
SetWindowPos(_hwnd SetWindowPos(_hwnd
, HWND_TOP , HWND_TOP
, left , left

View file

@ -1453,6 +1453,11 @@ BX_PRAGMA_DIAGNOSTIC_POP();
invalidateCache(); invalidateCache();
for (uint32_t ii = 0; ii < BX_COUNTOF(m_frameBuffers); ++ii)
{
m_frameBuffers[ii].destroy();
}
for (uint32_t ii = 0; ii < BX_COUNTOF(m_indexBuffers); ++ii) for (uint32_t ii = 0; ii < BX_COUNTOF(m_indexBuffers); ++ii)
{ {
m_indexBuffers[ii].destroy(); m_indexBuffers[ii].destroy();

View file

@ -248,6 +248,7 @@ namespace bgfx { namespace d3d11
{ {
FrameBufferD3D11() FrameBufferD3D11()
: m_dsv(NULL) : m_dsv(NULL)
, m_swapChain(NULL)
, m_width(0) , m_width(0)
, m_height(0) , m_height(0)
, m_denseIdx(UINT16_MAX) , m_denseIdx(UINT16_MAX)