diff --git a/renderdoc/data/glsl/deptharr2ms.frag b/renderdoc/data/glsl/deptharr2ms.frag
index 32c769b6e..c1c935ec6 100644
--- a/renderdoc/data/glsl/deptharr2ms.frag
+++ b/renderdoc/data/glsl/deptharr2ms.frag
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  ******************************************************************************/
  
-//#extension_nongles GL_ARB_sample_shading : require
+//#extension_glcore GL_ARB_sample_shading : require
 
 layout(binding = 0) uniform sampler2DArray srcDepthArray;
 layout(binding = 1) uniform usampler2DArray srcStencilArray;
diff --git a/renderdoc/data/glsl/depthms2arr.frag b/renderdoc/data/glsl/depthms2arr.frag
index 6907338af..de9bba1da 100644
--- a/renderdoc/data/glsl/depthms2arr.frag
+++ b/renderdoc/data/glsl/depthms2arr.frag
@@ -21,8 +21,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  ******************************************************************************/
- 
-//#extension_nongles GL_ARB_sample_shading : require
 
 layout(binding = 0) uniform sampler2DMSArray srcDepthMS;
 layout(binding = 1) uniform usampler2DMSArray srcStencilMS;
diff --git a/renderdoc/data/glsl_shaders.cpp b/renderdoc/data/glsl_shaders.cpp
index eb364336b..35a672c45 100644
--- a/renderdoc/data/glsl_shaders.cpp
+++ b/renderdoc/data/glsl_shaders.cpp
@@ -98,6 +98,13 @@ void GenerateGLSLShader(std::vector<std::string> &sources, ShaderType type,
 
         ext.erase(ext.find("_gles"), 5);
       }
+      else if(ext.find("#extension_glcore") == 0)
+      {
+        if(type != eShaderGLSL)
+          continue;
+
+        ext.erase(ext.find("_glcore"), 7);
+      }
       else if(ext.find("#extension_nongles") == 0)
       {
         if(type == eShaderGLSLES)