mirrors
/
bgfx
mirror of https://github.com/bkaradzic/bgfx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extended Remotery profiling.

This commit is contained in:
Andrew Mac 2015-11-16 10:42:56 -04:00
parent cbbba6e5f6
commit 6c395391a1
7 changed files with 107 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/common/entry/entry.cpp
View File

@ -4,12 +4,6 @@
*/ */
#include <bx/bx.h> #include <bx/bx.h>
#if BX_PLATFORM_WINDOWS
// BK - Remotery needs WinSock, but on VS2015/Win10 build
// fails if WinSock2 is included after Windows.h?!
# include <WinSock2.h>
#endif // BX_PLATFORM_WINDOWS
#include <bgfx/bgfx.h> #include <bgfx/bgfx.h>
#include <bx/string.h> #include <bx/string.h>
#include <bx/readerwriter.h> #include <bx/readerwriter.h>
@ -25,7 +19,7 @@
#include "input.h" #include "input.h"
#define RMT_ENABLED ENTRY_CONFIG_PROFILER #define RMT_ENABLED ENTRY_CONFIG_PROFILER
#include <remotery/lib/Remotery.c> #include <remotery/lib/Remotery.h>
extern "C" int _main_(int _argc, char** _argv); extern "C" int _main_(int _argc, char** _argv);

1
scripts/genie.lua
View File

@ -94,6 +94,7 @@ if _OPTIONS["with-profiler"] then
defines { defines {
"ENTRY_CONFIG_PROFILER=1", "ENTRY_CONFIG_PROFILER=1",
"BGFX_CONFIG_PROFILER_REMOTERY=1", "BGFX_CONFIG_PROFILER_REMOTERY=1",
"_WINSOCKAPI_"
} }
end end

6
src/bgfx.cpp
View File

@ -5,6 +5,12 @@
#include "bgfx_p.h" #include "bgfx_p.h"
#if BGFX_CONFIG_PROFILER_REMOTERY
# define RMT_USE_D3D11 BGFX_CONFIG_RENDERER_DIRECT3D11
# define RMT_USE_OPENGL 0
# include <remotery/lib/Remotery.c>
#endif
namespace bgfx namespace bgfx
{ {
#define BGFX_MAIN_THREAD_MAGIC UINT32_C(0x78666762) #define BGFX_MAIN_THREAD_MAGIC UINT32_C(0x78666762)

10
src/bgfx_p.h
View File

@ -53,14 +53,24 @@
# if BGFX_CONFIG_PROFILER_MICROPROFILE # if BGFX_CONFIG_PROFILER_MICROPROFILE
# include <microprofile.h> # include <microprofile.h>
# define BGFX_PROFILER_SCOPE(_group, _name, _color) MICROPROFILE_SCOPEI(#_group, #_name, _color) # define BGFX_PROFILER_SCOPE(_group, _name, _color) MICROPROFILE_SCOPEI(#_group, #_name, _color)
# define BGFX_PROFILER_BEGIN(_group, _name, _color) BX_NOOP()
# define BGFX_PROFILER_BEGIN_DYNAMIC(_namestr) BX_NOOP()
# define BGFX_PROFILER_END() BX_NOOP()
# define BGFX_PROFILER_SET_CURRENT_THREAD_NAME(_name) BX_NOOP() # define BGFX_PROFILER_SET_CURRENT_THREAD_NAME(_name) BX_NOOP()
# elif BGFX_CONFIG_PROFILER_REMOTERY # elif BGFX_CONFIG_PROFILER_REMOTERY
# define RMT_ENABLED BGFX_CONFIG_PROFILER_REMOTERY # define RMT_ENABLED BGFX_CONFIG_PROFILER_REMOTERY
# define RMT_USE_D3D11 BGFX_CONFIG_RENDERER_DIRECT3D11
# include <remotery/lib/Remotery.h> # include <remotery/lib/Remotery.h>
# define BGFX_PROFILER_SCOPE(_group, _name, _color) rmt_ScopedCPUSample(_group##_##_name) # define BGFX_PROFILER_SCOPE(_group, _name, _color) rmt_ScopedCPUSample(_group##_##_name)
# define BGFX_PROFILER_BEGIN(_group, _name, _color) rmt_BeginCPUSample(_group##_##_name)
# define BGFX_PROFILER_BEGIN_DYNAMIC(_namestr) rmt_BeginCPUSampleDynamic(_namestr)
# define BGFX_PROFILER_END() rmt_EndCPUSample()
# define BGFX_PROFILER_SET_CURRENT_THREAD_NAME(_name) rmt_SetCurrentThreadName(_name) # define BGFX_PROFILER_SET_CURRENT_THREAD_NAME(_name) rmt_SetCurrentThreadName(_name)
# else # else
# define BGFX_PROFILER_SCOPE(_group, _name, _color) BX_NOOP() # define BGFX_PROFILER_SCOPE(_group, _name, _color) BX_NOOP()
# define BGFX_PROFILER_BEGIN(_group, _name, _color) BX_NOOP()
# define BGFX_PROFILER_BEGIN_DYNAMIC(_namestr) BX_NOOP()
# define BGFX_PROFILER_END() BX_NOOP()
# define BGFX_PROFILER_SET_CURRENT_THREAD_NAME(_name) BX_NOOP() # define BGFX_PROFILER_SET_CURRENT_THREAD_NAME(_name) BX_NOOP()
# endif // BGFX_CONFIG_PROFILER_* # endif // BGFX_CONFIG_PROFILER_*
#endif // BGFX_PROFILER_SCOPE #endif // BGFX_PROFILER_SCOPE

40
src/renderer_d3d11.cpp
View File

@ -13,9 +13,24 @@
# include <windows.ui.xaml.media.dxinterop.h> # include <windows.ui.xaml.media.dxinterop.h>
#endif // BX_PLATFORM_WINRT #endif // BX_PLATFORM_WINRT
#if BGFX_CONFIG_PROFILER_REMOTERY
# define BGFX_GPU_PROFILER_BIND(_device, _context) rmt_BindD3D11(_device, _context)
# define BGFX_GPU_PROFILER_UNBIND() rmt_UnbindD3D11()
# define BGFX_GPU_PROFILER_BEGIN(_group, _name, _color) rmt_BeginD3D11Sample(_group##_##_name)
# define BGFX_GPU_PROFILER_BEGIN_DYNAMIC(_namestr) rmt_BeginD3D11SampleDynamic(_namestr)
# define BGFX_GPU_PROFILER_END() rmt_EndD3D11Sample()
#else
# define BGFX_GPU_PROFILER_BIND(_device, _context) BX_NOOP()
# define BGFX_GPU_PROFILER_UNBIND() BX_NOOP()
# define BGFX_GPU_PROFILER_BEGIN(_group, _name, _color) BX_NOOP()
# define BGFX_GPU_PROFILER_BEGIN_DYNAMIC(_namestr) BX_NOOP()
# define BGFX_GPU_PROFILER_END() BX_NOOP()
#endif
namespace bgfx { namespace d3d11 namespace bgfx { namespace d3d11
{ {
static wchar_t s_viewNameW[BGFX_CONFIG_MAX_VIEWS][BGFX_CONFIG_MAX_VIEW_NAME]; static wchar_t s_viewNameW[BGFX_CONFIG_MAX_VIEWS][BGFX_CONFIG_MAX_VIEW_NAME];
static char s_viewName[BGFX_CONFIG_MAX_VIEWS][BGFX_CONFIG_MAX_VIEW_NAME];
struct PrimInfo struct PrimInfo
{ {
@ -1405,9 +1420,8 @@ BX_PRAGMA_DIAGNOSTIC_POP();
// Init reserved part of view name. // Init reserved part of view name.
for (uint32_t ii = 0; ii < BGFX_CONFIG_MAX_VIEWS; ++ii) for (uint32_t ii = 0; ii < BGFX_CONFIG_MAX_VIEWS; ++ii)
{ {
char name[BGFX_CONFIG_MAX_VIEW_NAME_RESERVED+1]; bx::snprintf(s_viewName[ii], BGFX_CONFIG_MAX_VIEW_NAME_RESERVED + 1, "%3d ", ii);
bx::snprintf(name, sizeof(name), "%3d ", ii); mbstowcs(s_viewNameW[ii], s_viewName[ii], BGFX_CONFIG_MAX_VIEW_NAME_RESERVED);
mbstowcs(s_viewNameW[ii], name, BGFX_CONFIG_MAX_VIEW_NAME_RESERVED);
} }
if (BX_ENABLED(BGFX_CONFIG_DEBUG) if (BX_ENABLED(BGFX_CONFIG_DEBUG)
@ -1449,6 +1463,7 @@ BX_PRAGMA_DIAGNOSTIC_POP();
postReset(); postReset();
} }
BGFX_GPU_PROFILER_BIND(m_device, m_deviceCtx);
return true; return true;
error: error:
@ -1501,6 +1516,8 @@ BX_PRAGMA_DIAGNOSTIC_POP();
void shutdown() void shutdown()
{ {
BGFX_GPU_PROFILER_UNBIND();
preReset(); preReset();
m_ovr.shutdown(); m_ovr.shutdown();
@ -1864,6 +1881,11 @@ BX_PRAGMA_DIAGNOSTIC_POP();
, BX_COUNTOF(s_viewNameW[0])-BGFX_CONFIG_MAX_VIEW_NAME_RESERVED , BX_COUNTOF(s_viewNameW[0])-BGFX_CONFIG_MAX_VIEW_NAME_RESERVED
); );
} }
bx::strlcpy(&s_viewName[_id][BGFX_CONFIG_MAX_VIEW_NAME_RESERVED]
, _name
, BX_COUNTOF(s_viewName[0]) - BGFX_CONFIG_MAX_VIEW_NAME_RESERVED
);
} }
void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) BX_OVERRIDE void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) BX_OVERRIDE
@ -4622,6 +4644,7 @@ BX_PRAGMA_DIAGNOSTIC_POP();
void RendererContextD3D11::submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) void RendererContextD3D11::submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter)
{ {
PIX_BEGINEVENT(D3DCOLOR_RGBA(0xff, 0x00, 0x00, 0xff), L"rendererSubmit"); PIX_BEGINEVENT(D3DCOLOR_RGBA(0xff, 0x00, 0x00, 0xff), L"rendererSubmit");
BGFX_GPU_PROFILER_BEGIN_DYNAMIC("rendererSubmit");
ID3D11DeviceContext* deviceCtx = m_deviceCtx; ID3D11DeviceContext* deviceCtx = m_deviceCtx;
@ -4754,6 +4777,13 @@ BX_PRAGMA_DIAGNOSTIC_POP();
} }
PIX_ENDEVENT(); PIX_ENDEVENT();
if (item > 1)
{
BGFX_GPU_PROFILER_END();
BGFX_PROFILER_END();
}
BGFX_PROFILER_BEGIN_DYNAMIC(s_viewName[view]);
BGFX_GPU_PROFILER_BEGIN_DYNAMIC(s_viewName[view]);
viewState.m_rect = _render->m_rect[view]; viewState.m_rect = _render->m_rect[view];
if (viewRestart) if (viewRestart)
@ -5498,10 +5528,14 @@ BX_PRAGMA_DIAGNOSTIC_POP();
captureElapsed = -bx::getHPCounter(); captureElapsed = -bx::getHPCounter();
capture(); capture();
captureElapsed += bx::getHPCounter(); captureElapsed += bx::getHPCounter();
BGFX_GPU_PROFILER_END();
BGFX_PROFILER_END();
} }
} }
PIX_ENDEVENT(); PIX_ENDEVENT();
BGFX_GPU_PROFILER_END();
int64_t now = bx::getHPCounter(); int64_t now = bx::getHPCounter();
elapsed += now; elapsed += now;

18
src/renderer_d3d9.cpp
View File

@ -11,6 +11,7 @@
namespace bgfx { namespace d3d9 namespace bgfx { namespace d3d9
{ {
static wchar_t s_viewNameW[BGFX_CONFIG_MAX_VIEWS][BGFX_CONFIG_MAX_VIEW_NAME]; static wchar_t s_viewNameW[BGFX_CONFIG_MAX_VIEWS][BGFX_CONFIG_MAX_VIEW_NAME];
static char s_viewName[BGFX_CONFIG_MAX_VIEWS][BGFX_CONFIG_MAX_VIEW_NAME];
struct PrimInfo struct PrimInfo
{ {
@ -732,9 +733,8 @@ namespace bgfx { namespace d3d9
// Init reserved part of view name. // Init reserved part of view name.
for (uint32_t ii = 0; ii < BGFX_CONFIG_MAX_VIEWS; ++ii) for (uint32_t ii = 0; ii < BGFX_CONFIG_MAX_VIEWS; ++ii)
{ {
char name[BGFX_CONFIG_MAX_VIEW_NAME_RESERVED+1]; bx::snprintf(s_viewName[ii], BGFX_CONFIG_MAX_VIEW_NAME_RESERVED + 1, "%3d ", ii);
bx::snprintf(name, sizeof(name), "%3d ", ii); mbstowcs(s_viewNameW[ii], s_viewName[ii], BGFX_CONFIG_MAX_VIEW_NAME_RESERVED);
mbstowcs(s_viewNameW[ii], name, BGFX_CONFIG_MAX_VIEW_NAME_RESERVED);
} }
if (NULL != m_deviceEx) if (NULL != m_deviceEx)
@ -1106,6 +1106,11 @@ namespace bgfx { namespace d3d9
, BX_COUNTOF(s_viewNameW[0])-BGFX_CONFIG_MAX_VIEW_NAME_RESERVED , BX_COUNTOF(s_viewNameW[0])-BGFX_CONFIG_MAX_VIEW_NAME_RESERVED
); );
} }
bx::strlcpy(&s_viewName[_id][BGFX_CONFIG_MAX_VIEW_NAME_RESERVED]
, _name
, BX_COUNTOF(s_viewName[0]) - BGFX_CONFIG_MAX_VIEW_NAME_RESERVED
);
} }
void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) BX_OVERRIDE void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) BX_OVERRIDE
@ -3564,6 +3569,11 @@ namespace bgfx { namespace d3d9
PIX_ENDEVENT(); PIX_ENDEVENT();
PIX_BEGINEVENT(D3DCOLOR_RGBA(0xff, 0x00, 0x00, 0xff), s_viewNameW[key.m_view]); PIX_BEGINEVENT(D3DCOLOR_RGBA(0xff, 0x00, 0x00, 0xff), s_viewNameW[key.m_view]);
if (item > 0)
{
BGFX_PROFILER_END();
}
BGFX_PROFILER_BEGIN_DYNAMIC(s_viewName[key.m_view]);
view = key.m_view; view = key.m_view;
programIdx = invalidHandle; programIdx = invalidHandle;
@ -4077,6 +4087,8 @@ namespace bgfx { namespace d3d9
captureElapsed = -bx::getHPCounter(); captureElapsed = -bx::getHPCounter();
capture(); capture();
captureElapsed += bx::getHPCounter(); captureElapsed += bx::getHPCounter();
BGFX_PROFILER_END();
} }
} }

44
src/renderer_gl.cpp
View File

@ -10,6 +10,20 @@
# include <bx/timer.h> # include <bx/timer.h>
# include <bx/uint32_t.h> # include <bx/uint32_t.h>
#if BGFX_CONFIG_PROFILER_REMOTERY
# define BGFX_GPU_PROFILER_BIND() rmt_BindOpenGL()
# define BGFX_GPU_PROFILER_UNBIND() rmt_UnbindOpenGL()
# define BGFX_GPU_PROFILER_BEGIN(_group, _name, _color) rmt_BeginOpenGLSample(_group##_##_name)
# define BGFX_GPU_PROFILER_BEGIN_DYNAMIC(_namestr) rmt_BeginOpenGLSampleDynamic(_namestr)
# define BGFX_GPU_PROFILER_END() rmt_EndOpenGLSample()
#else
# define BGFX_GPU_PROFILER_BIND(_device, _context) BX_NOOP()
# define BGFX_GPU_PROFILER_UNBIND() BX_NOOP()
# define BGFX_GPU_PROFILER_BEGIN(_group, _name, _color) BX_NOOP()
# define BGFX_GPU_PROFILER_BEGIN_DYNAMIC(_namestr) BX_NOOP()
# define BGFX_GPU_PROFILER_END() BX_NOOP()
#endif
namespace bgfx { namespace gl namespace bgfx { namespace gl
{ {
static char s_viewName[BGFX_CONFIG_MAX_VIEWS][BGFX_CONFIG_MAX_VIEW_NAME]; static char s_viewName[BGFX_CONFIG_MAX_VIEWS][BGFX_CONFIG_MAX_VIEW_NAME];
@ -1958,10 +1972,14 @@ namespace bgfx { namespace gl
} }
ovrPostReset(); ovrPostReset();
BGFX_GPU_PROFILER_BIND();
} }
void shutdown() void shutdown()
{ {
BGFX_GPU_PROFILER_UNBIND();
ovrPreReset(); ovrPreReset();
m_ovr.shutdown(); m_ovr.shutdown();
@ -2272,13 +2290,10 @@ namespace bgfx { namespace gl
void updateViewName(uint8_t _id, const char* _name) BX_OVERRIDE void updateViewName(uint8_t _id, const char* _name) BX_OVERRIDE
{ {
if (BX_ENABLED(BGFX_CONFIG_DEBUG_PIX) ) bx::strlcpy(&s_viewName[_id][BGFX_CONFIG_MAX_VIEW_NAME_RESERVED]
{ , _name
bx::strlcpy(&s_viewName[_id][BGFX_CONFIG_MAX_VIEW_NAME_RESERVED] , BX_COUNTOF(s_viewName[0])-BGFX_CONFIG_MAX_VIEW_NAME_RESERVED
, _name );
, BX_COUNTOF(s_viewName[0])-BGFX_CONFIG_MAX_VIEW_NAME_RESERVED
);
}
} }
void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) BX_OVERRIDE void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) BX_OVERRIDE
@ -5217,6 +5232,8 @@ namespace bgfx { namespace gl
void RendererContextGL::submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) void RendererContextGL::submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter)
{ {
BGFX_GPU_PROFILER_BEGIN_DYNAMIC("rendererSubmit");
if (1 < m_numWindows if (1 < m_numWindows
&& m_vaoSupport) && m_vaoSupport)
{ {
@ -5383,6 +5400,14 @@ namespace bgfx { namespace gl
eye = 0; eye = 0;
} }
if (item > 1)
{
BGFX_GPU_PROFILER_END();
BGFX_PROFILER_END();
}
BGFX_PROFILER_BEGIN_DYNAMIC(s_viewName[view]);
BGFX_GPU_PROFILER_BEGIN_DYNAMIC(s_viewName[view]);
viewState.m_rect = _render->m_rect[view]; viewState.m_rect = _render->m_rect[view];
if (viewRestart) if (viewRestart)
{ {
@ -6266,9 +6291,14 @@ namespace bgfx { namespace gl
captureElapsed = -bx::getHPCounter(); captureElapsed = -bx::getHPCounter();
capture(); capture();
captureElapsed += bx::getHPCounter(); captureElapsed += bx::getHPCounter();
BGFX_GPU_PROFILER_END();
BGFX_PROFILER_END();
} }
} }
BGFX_GPU_PROFILER_END();
m_glctx.makeCurrent(NULL); m_glctx.makeCurrent(NULL);
int64_t now = bx::getHPCounter(); int64_t now = bx::getHPCounter();
elapsed += now; elapsed += now;