From 8de39dd85054a6be9de152b77810a1d87423013a Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 25 Feb 2020 13:45:23 +0000 Subject: [PATCH] Don't report duplicate GL extensions. Closes #1739 --- renderdoc/driver/gl/gl_driver.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index 18552a4b5..a152ef749 100644 --- a/renderdoc/driver/gl/gl_driver.cpp +++ b/renderdoc/driver/gl/gl_driver.cpp @@ -1427,14 +1427,22 @@ void WrappedOpenGL::ActivateContext(GLWindowingData winData) // similarly we report all the debug extensions so that applications can use them freely - we // don't call into the driver so we don't need to care if the driver supports them - ctxdata.glExts.push_back("GL_KHR_debug"); - ctxdata.glExts.push_back("GL_EXT_debug_label"); - ctxdata.glExts.push_back("GL_EXT_debug_marker"); + if(!ctxdata.glExts.contains("GL_KHR_debug")) + ctxdata.glExts.push_back("GL_KHR_debug"); + + if(!ctxdata.glExts.contains("GL_EXT_debug_label")) + ctxdata.glExts.push_back("GL_EXT_debug_label"); + + if(!ctxdata.glExts.contains("GL_EXT_debug_marker")) + ctxdata.glExts.push_back("GL_EXT_debug_marker"); if(!IsGLES) { - ctxdata.glExts.push_back("GL_GREMEDY_frame_terminator"); - ctxdata.glExts.push_back("GL_GREMEDY_string_marker"); + if(!ctxdata.glExts.contains("GL_GREMEDY_frame_terminator")) + ctxdata.glExts.push_back("GL_GREMEDY_frame_terminator"); + + if(!ctxdata.glExts.contains("GL_GREMEDY_string_marker")) + ctxdata.glExts.push_back("GL_GREMEDY_string_marker"); } merge(ctxdata.glExts, ctxdata.glExtsString, ' ');