From a241daa114810d5569f2feb3f1a90dfc2a861a3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sat, 4 Nov 2017 15:18:33 -0700 Subject: [PATCH] Updated thread funcs to match bx. --- examples/common/entry/entry_windows.cpp | 4 ++-- src/bgfx_p.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/common/entry/entry_windows.cpp b/examples/common/entry/entry_windows.cpp index 18e55531b..68045859e 100644 --- a/examples/common/entry/entry_windows.cpp +++ b/examples/common/entry/entry_windows.cpp @@ -313,7 +313,7 @@ namespace entry int m_argc; const char* const* m_argv; - static int32_t threadFunc(void* _userData); + static int32_t threadFunc(bx::Thread* _thread, void* _userData); }; struct Msg @@ -1096,7 +1096,7 @@ namespace entry PostMessage(s_ctx.m_hwnd[0], WM_USER_WINDOW_MOUSE_LOCK, _handle.idx, _lock); } - int32_t MainThreadEntry::threadFunc(void* _userData) + int32_t MainThreadEntry::threadFunc(bx::Thread* /*_thread*/, void* _userData) { MainThreadEntry* self = (MainThreadEntry*)_userData; int32_t result = main(self->m_argc, self->m_argv); diff --git a/src/bgfx_p.h b/src/bgfx_p.h index bcb03378d..a3e45ec43 100644 --- a/src/bgfx_p.h +++ b/src/bgfx_p.h @@ -2604,7 +2604,7 @@ namespace bgfx { } - static int32_t renderThread(void* /*_userData*/) + static int32_t renderThread(bx::Thread* /*_self*/, void* /*_userData*/) { BX_TRACE("render thread start"); BGFX_PROFILER_SET_CURRENT_THREAD_NAME("bgfx - Render Thread");