|
|
@@ -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() );
|
|
|
}
|
|
|
}
|
|
|
|