From 00ac5651f528d84cc3cf7320b34407bce7d38d93 Mon Sep 17 00:00:00 2001
From: Karen Webb <karen.webb@umbralsoftware.co.uk>
Date: Mon, 10 Feb 2025 19:11:44 +0000
Subject: [PATCH] Warn if using GL_EXT_nontemporal_keyword with GLSL memory
 model

---
 glslang/MachineIndependent/Scan.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/glslang/MachineIndependent/Scan.cpp b/glslang/MachineIndependent/Scan.cpp
index 3f47ebf0cb..45fe36a1a6 100644
--- 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: