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

This commit is contained in:
Branimir Karadžić 2017-08-23 21:13:39 -07:00
commit 27b2dbd30a

View File

@ -6504,7 +6504,8 @@ namespace bgfx { namespace gl
uint32_t frameQueryIdx = UINT32_MAX;
if (m_timerQuerySupport)
if (m_timerQuerySupport
&& !BX_ENABLED(BX_PLATFORM_OSX) )
{
frameQueryIdx = m_gpuTimer.begin(BGFX_CONFIG_MAX_VIEWS);
}