diff --git a/src/dxvk/dxvk_shader.cpp b/src/dxvk/dxvk_shader.cpp
index b65931892..e3e99d71d 100644
--- a/src/dxvk/dxvk_shader.cpp
+++ b/src/dxvk/dxvk_shader.cpp
@@ -88,7 +88,8 @@ namespace dxvk {
         if (ins.arg(1) == spv::CapabilitySampleRateShading)
           m_flags.set(DxvkShaderFlag::HasSampleRateShading);
 
-        if (ins.arg(1) == spv::CapabilityShaderViewportIndexLayerEXT)
+        if (ins.arg(1) == spv::CapabilityShaderViewportIndex
+         || ins.arg(1) == spv::CapabilityShaderLayer)
           m_flags.set(DxvkShaderFlag::ExportsViewportIndexLayerFromVertexStage);
       }