From 626e81478f2bcf759567975a3c94478374d1811d Mon Sep 17 00:00:00 2001
From: Ellie Hermaszewska <ellieh@nvidia.com>
Date: Thu, 12 Dec 2024 14:52:14 +0800
Subject: Bump spirv-header/tools/glslang (#5834)

* Back out "Update SPIRV submodules (#5815)"

This backs out commit e50aac13e2c161d672b137a62f6d66820d0f9ff1.

* Use upstream spirv-tools

* Fix bump-glslang.sh for newer versions of spirv-tools

* Use upstream glslang

* Add --do-fetch option to bump glslang

* Bump glslang and friends

Supersedes https://github.com/shader-slang/slang/pull/5815

* Regenerate glslang and spirv-tools outputs

* Fixes to slang-glslang

* Correct spirv intrinsic for OpImageSampleFootprintNV

Note that this currently fails validation with the following error:

```
error: line 145: Result <id> from OpSampledImage instruction must not appear as operand for OpImageSampleFootprintNV, since it is not specified as taking an OpTypeSampledImage. Found result <id> '55[%sampledImage]' as an operand of <id> '56[%resultVal]'.
  %sampledImage = OpSampledImage %54 %51 %40
```

This seems to be in error as the spec for
*SPV_NV_shader_image_footprint* states that "Sampled Image must be an
object whose type is OpTypeSampledImage"

https://refined-github-html-preview.kidonng.workers.dev/KhronosGroup/SPIRV-Registry/raw/refs/heads/main/extensions/NV/SPV_NV_shader_image_footprint.html

glslang also seems to fail with the same validation error

* Fix spv storage class test
---
 source/slang-glslang/slang-glslang.cpp | 5 +++--
 source/slang/hlsl.meta.slang           | 7 -------
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'source')

diff --git a/source/slang-glslang/slang-glslang.cpp b/source/slang-glslang/slang-glslang.cpp
index 6bfd112a7..4abcada62 100644
--- a/source/slang-glslang/slang-glslang.cpp
+++ b/source/slang-glslang/slang-glslang.cpp
@@ -2,8 +2,7 @@
 #include "slang-glslang.h"
 
 #include "SPIRV/GlslangToSpv.h"
-#include "SPIRV/disassemble.h"
-#include "glslang/Public/ResourceLimits.h"
+#include "glslang/MachineIndependent/localintermediate.h"
 #include "glslang/Public/ShaderLang.h"
 #include "slang.h"
 #include "spirv-tools/libspirv.h"
@@ -13,6 +12,8 @@
 #include <windows.h>
 #endif
 
+#include <cassert>
+#include <iostream>
 #include <memory>
 #include <mutex>
 #include <sstream>
diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang
index 35b88f9dc..194c14b19 100644
--- a/source/slang/hlsl.meta.slang
+++ b/source/slang/hlsl.meta.slang
@@ -19785,7 +19785,6 @@ ${
 }
 
     [__NoSideEffect]
-    [ForceInline]
     __glsl_version(450)
     __glsl_extension(GL_NV_shader_texture_footprint)
     [require(glsl_spirv, texturefootprint)]
@@ -19813,7 +19812,6 @@ ${
     }
 
     [__NoSideEffect]
-    [ForceInline]
     __glsl_version(450)
     __glsl_extension(GL_NV_shader_texture_footprint)
     [require(glsl_spirv, texturefootprint)]
@@ -19842,7 +19840,6 @@ ${
     }
 
     [__NoSideEffect]
-    [ForceInline]
     __glsl_version(450)
     __glsl_extension(GL_NV_shader_texture_footprint)
     __glsl_extension(GL_ARB_sparse_texture_clamp)
@@ -19873,7 +19870,6 @@ ${
     }
 
     [__NoSideEffect]
-    [ForceInline]
     __glsl_version(450)
     __glsl_extension(GL_NV_shader_texture_footprint)
     __glsl_extension(GL_ARB_sparse_texture_clamp)
@@ -19905,7 +19901,6 @@ ${
     }
 
     [__NoSideEffect]
-    [ForceInline]
     __glsl_version(450)
     __glsl_extension(GL_NV_shader_texture_footprint)
     [__requiresNVAPI]
@@ -19939,7 +19934,6 @@ ${{{
     // Texture sampling with gradient is only available for 2D textures.
 }}}
     [__NoSideEffect]
-    [ForceInline]
     __glsl_version(450)
     __glsl_extension(GL_NV_shader_texture_footprint)
     [__requiresNVAPI]
@@ -19970,7 +19964,6 @@ ${{{
     }
 
     [__NoSideEffect]
-    [ForceInline]
     __glsl_version(450)
     __glsl_extension(GL_NV_shader_texture_footprint)
     __glsl_extension(GL_ARB_sparse_texture_clamp)
-- 
cgit v1.2.3