From 7cf071195bcc9e5013cf3e14c934dcc80cc0bb57 Mon Sep 17 00:00:00 2001
From: Teodor Tanasoaia <28601907+teoxoy@users.noreply.github.com>
Date: Mon, 24 Jun 2024 11:26:16 +0200
Subject: [PATCH] [glsl] add more reserved keywords from previous specs

---
 naga/src/back/glsl/keywords.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/naga/src/back/glsl/keywords.rs b/naga/src/back/glsl/keywords.rs
index 47415c5158..1edd7baacf 100644
--- a/naga/src/back/glsl/keywords.rs
+++ b/naga/src/back/glsl/keywords.rs
@@ -250,6 +250,14 @@ pub const RESERVED_KEYWORDS: &[&str] = &[
     "namespace",
     "using",
     "sampler3DRect",
+    // Reserved keywords that were unreserved in GLSL 4.2
+    "image1DArrayShadow",
+    "image1DShadow",
+    "image2DArrayShadow",
+    "image2DShadow",
+    // Reserved keywords that were unreserved in GLSL 4.4
+    "packed",
+    "row_major",
     //
     // GLSL 4.6 Built-In Functions, from https://github.com/KhronosGroup/OpenGL-Registry/blob/d00e11dc1a1ffba581d633f21f70202051248d5c/specs/gl/GLSLangSpec.4.60.html#L13314
     //
@@ -473,8 +481,6 @@ pub const RESERVED_KEYWORDS: &[&str] = &[
     "anyInvocation",
     "allInvocations",
     "allInvocationsEqual",
-    // Sometimes "packed" is a keyword, see https://github.com/gfx-rs/wgpu/issues/5853
-    "packed",
     //
     // entry point name (should not be shadowed)
     //