Warn if using GL_EXT_nontemporal_keyword with GLSL memory model

KhronosGroup · Feb 12, 2025 · 00ac565 · 00ac565
1 parent 2082702
commit 00ac565
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/glslang/MachineIndependent/Scan.cpp b/glslang/MachineIndependent/Scan.cpp
@@ -1108,8 +1108,11 @@ int TScanContext::tokenizeIdentifier()
             reservedWord();
         return keyword;
     case NONTEMPORAL:
-        if (parseContext.symbolTable.atBuiltInLevel() ||
-            (parseContext.extensionTurnedOn(E_GL_EXT_nontemporal_keyword)))
+        if (parseContext.symbolTable.atBuiltInLevel())
+            return keyword;
+        if (!parseContext.intermediate.usingVulkanMemoryModel())
+            parseContext.warn(loc, "Nontemporal without the Vulkan Memory Model is ignored", tokenText, "");
+        if (parseContext.extensionTurnedOn(E_GL_EXT_nontemporal_keyword))
             return keyword;
         return identifierOrType();
     case PATCH: