From 626e81478f2bcf759567975a3c94478374d1811d Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska 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 from OpSampledImage instruction must not appear as operand for OpImageSampleFootprintNV, since it is not specified as taking an OpTypeSampledImage. Found result '55[%sampledImage]' as an operand of '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 --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 29dff6c36..d5bfdc007 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "external/glslang"] path = external/glslang - url = https://github.com/shader-slang/glslang.git + url = https://github.com/KhronosGroup/glslang [submodule "external/tinyobjloader"] path = external/tinyobjloader url = https://github.com/syoyo/tinyobjloader @@ -15,7 +15,7 @@ url = https://github.com/shader-slang/slang-binaries [submodule "external/spirv-tools"] path = external/spirv-tools - url = https://github.com/shader-slang/SPIRV-Tools.git + url = https://github.com/KhronosGroup/SPIRV-Tools.git [submodule "external/spirv-headers"] path = external/spirv-headers url = https://github.com/KhronosGroup/SPIRV-Headers.git -- cgit v1.2.3