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

Fixed debug marker extension check.

Browse source
This commit is contained in:
bkaradzic 2014-03-29 14:32:16 -07:00
parent 10981a386a
commit 4410e0de4d
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/renderer_gl.cpp
View file

@ -1401,14 +1401,16 @@ namespace bgfx
}
#endif // BGFX_CONFIG_RENDERER_OPENGL
if (NULL == glFrameTerminatorGREMEDY)
if (NULL == glFrameTerminatorGREMEDY
|| !s_extension[Extension::GREMEDY_frame_terminator].m_supported)
{
glFrameTerminatorGREMEDY = stubFrameTerminatorGREMEDY;
}
if (NULL == glInsertEventMarker)
if (NULL == glInsertEventMarker
|| !s_extension[Extension::EXT_debug_marker].m_supported)
{
glInsertEventMarker = NULL != glStringMarkerGREMEDY
glInsertEventMarker = (NULL != glStringMarkerGREMEDY && s_extension[Extension::GREMEDY_string_marker].m_supported)
? stubInsertEventMarkerGREMEDY
: stubInsertEventMarker
;
@ -3296,7 +3298,7 @@ namespace bgfx
void Context::rendererSetMarker(const char* _marker, uint32_t _size)
{
GL_CHECK_I(glInsertEventMarker(_size, _marker) );
GL_CHECK(glInsertEventMarker(_size, _marker) );
}
void Context::rendererSubmit()
@ -3393,7 +3395,7 @@ namespace bgfx
currentState.m_flags = newFlags;
currentState.m_stencil = newStencil;
GL_CHECK_I(glInsertEventMarker(0, s_viewName[key.m_view]) );
GL_CHECK(glInsertEventMarker(0, s_viewName[key.m_view]) );
view = key.m_view;
programIdx = invalidHandle;
@ -4233,7 +4235,7 @@ namespace bgfx
m_textVideoMemBlitter.blit(m_render->m_textVideoMem);
}
GL_CHECK_I(glFrameTerminatorGREMEDY() );
GL_CHECK(glFrameTerminatorGREMEDY() );
}
}