From 10b9d079bf47f4fd7dfbd72a0805ede62265bc20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sun, 22 May 2016 17:20:27 -0700 Subject: [PATCH] Cleanup. --- examples/common/entry/entry_android.cpp | 6 ++++-- src/bgfx_p.h | 12 +++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/common/entry/entry_android.cpp b/examples/common/entry/entry_android.cpp index 34f2c7824..78c9dccbe 100644 --- a/examples/common/entry/entry_android.cpp +++ b/examples/common/entry/entry_android.cpp @@ -110,7 +110,7 @@ namespace entry const char* argv[1] = { "android.so" }; m_mte.m_argc = 1; m_mte.m_argv = const_cast(argv); - + while (0 == m_app->destroyRequested) { int32_t num; @@ -152,8 +152,10 @@ namespace entry WindowHandle defaultWindow = { 0 }; m_eventQueue.postSizeEvent(defaultWindow, width, height); - if (!m_thread.isRunning()) + if (!m_thread.isRunning() ) + { m_thread.init(MainThreadEntry::threadFunc, &m_mte); + } } break; diff --git a/src/bgfx_p.h b/src/bgfx_p.h index 2d2e641a5..3f9e92ad0 100644 --- a/src/bgfx_p.h +++ b/src/bgfx_p.h @@ -2135,7 +2135,11 @@ namespace bgfx BX_WARN(0 != _width && 0 != _height, "Frame buffer resolution width or height cannot be 0 (width %d, height %d).", _width, _height); m_resolution.m_width = bx::uint32_max(1, _width); m_resolution.m_height = bx::uint32_max(1, _height); - m_resolution.m_flags = _flags; + m_resolution.m_flags = 0 + | _flags + | (g_platformDataChangedSinceReset ? BGFX_RESET_INTERNAL_FORCE : 0) + ; + g_platformDataChangedSinceReset = false; m_flipAfterRender = !!(_flags & BGFX_RESET_FLIP_AFTER_RENDER); @@ -2155,12 +2159,6 @@ namespace bgfx m_resolution.m_flags |= BGFX_RESET_INTERNAL_FORCE; } } - - if (g_platformDataChangedSinceReset) - { - m_resolution.m_flags |= BGFX_RESET_INTERNAL_FORCE; - g_platformDataChangedSinceReset = false; - } } BGFX_API_FUNC(void setDebug(uint32_t _debug) )