From 14dbb6732030d3a258d94b324c2e04637f66a6c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Tue, 10 Jan 2017 17:14:50 -0800 Subject: [PATCH] Fixed IFH debug flag. --- examples/common/entry/entry.cpp | 3 ++- examples/common/entry/entry_p.h | 2 +- src/renderer_d3d11.cpp | 1 + src/renderer_d3d12.cpp | 3 ++- src/renderer_d3d9.cpp | 1 + src/renderer_gl.cpp | 1 + src/renderer_vk.cpp | 3 ++- 7 files changed, 10 insertions(+), 4 deletions(-) diff --git a/examples/common/entry/entry.cpp b/examples/common/entry/entry.cpp index a7de5e47d..edc237a49 100644 --- a/examples/common/entry/entry.cpp +++ b/examples/common/entry/entry.cpp @@ -353,6 +353,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); { entry::Key::KeyF, entry::Modifier::RightCtrl, 1, NULL, "graphics fullscreen" }, { entry::Key::Return, entry::Modifier::RightAlt, 1, NULL, "graphics fullscreen" }, { entry::Key::F1, entry::Modifier::None, 1, NULL, "graphics stats" }, + { entry::Key::F1, entry::Modifier::LeftCtrl, 1, NULL, "graphics ifh" }, { entry::Key::GamepadStart, entry::Modifier::None, 1, NULL, "graphics stats" }, { entry::Key::F1, entry::Modifier::LeftShift, 1, NULL, "graphics stats 0\ngraphics text 0" }, { entry::Key::F3, entry::Modifier::None, 1, NULL, "graphics wireframe" }, @@ -365,7 +366,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); { entry::Key::F10, entry::Modifier::None, 1, NULL, "graphics hidpi" }, { entry::Key::Print, entry::Modifier::None, 1, NULL, "graphics screenshot" }, { entry::Key::KeyP, entry::Modifier::LeftCtrl, 1, NULL, "graphics screenshot" }, - + INPUT_BINDING_END }; diff --git a/examples/common/entry/entry_p.h b/examples/common/entry/entry_p.h index 3cd9d95c7..74a279f8e 100644 --- a/examples/common/entry/entry_p.h +++ b/examples/common/entry/entry_p.h @@ -14,7 +14,7 @@ #include // memcpy #ifndef ENTRY_CONFIG_USE_NOOP -# define ENTRY_CONFIG_USE_NOOP (BX_PLATFORM_QNX || BX_PLATFORM_PS4) +# define ENTRY_CONFIG_USE_NOOP (BX_PLATFORM_QNX) #endif // ENTRY_CONFIG_USE_NOOP #ifndef ENTRY_CONFIG_USE_SDL diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index 8cccbcd6d..984ec4b1c 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -6195,6 +6195,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); { PIX_BEGINEVENT(D3DCOLOR_FRAME, L"debugstats"); + m_needPresent = true; TextVideoMem& tvm = m_textVideoMem; static int64_t next = now; diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp index 2f36d1aa1..e593d5ba0 100644 --- a/src/renderer_d3d12.cpp +++ b/src/renderer_d3d12.cpp @@ -5489,10 +5489,11 @@ data.NumQualityLevels = 0; perfStats.numCompute = statsKeyType[1]; perfStats.maxGpuLatency = maxGpuLatency; - if (_render->m_debug & (BGFX_DEBUG_IFH | BGFX_DEBUG_STATS) ) + if (_render->m_debug & (BGFX_DEBUG_IFH|BGFX_DEBUG_STATS) ) { // PIX_BEGINEVENT(D3DCOLOR_FRAME, L"debugstats"); +// m_needPresent = true; TextVideoMem& tvm = m_textVideoMem; static int64_t next = now; diff --git a/src/renderer_d3d9.cpp b/src/renderer_d3d9.cpp index d95d7d93a..1f1adee0a 100644 --- a/src/renderer_d3d9.cpp +++ b/src/renderer_d3d9.cpp @@ -4272,6 +4272,7 @@ namespace bgfx { namespace d3d9 { PIX_BEGINEVENT(D3DCOLOR_FRAME, L"debugstats"); + m_needPresent = true; TextVideoMem& tvm = m_textVideoMem; static int64_t next = now; diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 3901083ee..38ca1b663 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -7320,6 +7320,7 @@ namespace bgfx { namespace gl if (_render->m_debug & (BGFX_DEBUG_IFH|BGFX_DEBUG_STATS) ) { + m_needPresent = true; TextVideoMem& tvm = m_textVideoMem; static int64_t next = now; diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp index d1df4c41b..d03c9e565 100644 --- a/src/renderer_vk.cpp +++ b/src/renderer_vk.cpp @@ -4435,10 +4435,11 @@ BX_UNUSED(presentMin, presentMax); // perfStats.numCompute = statsKeyType[1]; // perfStats.maxGpuLatency = maxGpuLatency; - if (_render->m_debug & (BGFX_DEBUG_IFH | BGFX_DEBUG_STATS) ) + if (_render->m_debug & (BGFX_DEBUG_IFH|BGFX_DEBUG_STATS) ) { // PIX_BEGINEVENT(D3DCOLOR_RGBA(0x40, 0x40, 0x40, 0xff), L"debugstats"); +// m_needPresent = true; TextVideoMem& tvm = m_textVideoMem; static int64_t next = now;