scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 18:45:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

OSX: Fixed query counter crash.

Browse source
This commit is contained in:
Branimir Karadžić 2015-11-13 08:18:21 -08:00
parent 1a3ca7d8ac
commit 10674ad181
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/renderer_gl.h
View file

@ -1235,9 +1235,12 @@ namespace bgfx { namespace gl
}
Frame& frame = m_frame[m_control.m_current];
GL_CHECK(glQueryCounter(frame.m_begin
, GL_TIMESTAMP
) );
if (!BX_ENABLED(BX_PLATFORM_OSX) )
{
GL_CHECK(glQueryCounter(frame.m_begin
, GL_TIMESTAMP
) );
}
GL_CHECK(glBeginQuery(GL_TIME_ELAPSED
, frame.m_elapsed
@ -1264,10 +1267,17 @@ namespace bgfx { namespace gl
if (available)
{
GL_CHECK(glGetQueryObjectui64v(frame.m_begin
, GL_QUERY_RESULT
, &m_begin
) );
if (!BX_ENABLED(BX_PLATFORM_OSX) )
{
GL_CHECK(glGetQueryObjectui64v(frame.m_begin
, GL_QUERY_RESULT
, &m_begin
) );
}
else
{
m_begin = 0;
}
GL_CHECK(glGetQueryObjectui64v(frame.m_elapsed
, GL_QUERY_RESULT