From 24c5c2f0967401ccda2cbfad4bddf56f71a23145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?=
 <branimirkaradzic@gmail.com>
Date: Sun, 2 Oct 2022 22:57:50 -0700
Subject: [PATCH] shaderc: Updated to new glslang.

---
 scripts/shaderc.lua             | 7 ++-----
 tools/shaderc/shaderc_metal.cpp | 9 +++++++++
 tools/shaderc/shaderc_spirv.cpp | 9 +++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/scripts/shaderc.lua b/scripts/shaderc.lua
index d09c665f2..00fff6740 100644
--- a/scripts/shaderc.lua
+++ b/scripts/shaderc.lua
@@ -123,11 +123,13 @@ project "spirv-opt"
 		path.join(SPIRV_TOOLS, "source/val/validate_logicals.cpp"),
 		path.join(SPIRV_TOOLS, "source/val/validate_memory.cpp"),
 		path.join(SPIRV_TOOLS, "source/val/validate_memory_semantics.cpp"),
+		path.join(SPIRV_TOOLS, "source/val/validate_mesh_shading.cpp"),
 		path.join(SPIRV_TOOLS, "source/val/validate_misc.cpp"),
 		path.join(SPIRV_TOOLS, "source/val/validate_mode_setting.cpp"),
 		path.join(SPIRV_TOOLS, "source/val/validate_non_uniform.cpp"),
 		path.join(SPIRV_TOOLS, "source/val/validate_primitives.cpp"),
 		path.join(SPIRV_TOOLS, "source/val/validate_ray_query.cpp"),
+		path.join(SPIRV_TOOLS, "source/val/validate_ray_tracing.cpp"),
 		path.join(SPIRV_TOOLS, "source/val/validate_scopes.cpp"),
 		path.join(SPIRV_TOOLS, "source/val/validate_small_type_uses.cpp"),
 		path.join(SPIRV_TOOLS, "source/val/validate_type.cpp"),
@@ -234,11 +236,6 @@ project "glslang"
 		path.join(GLSLANG, "OGLCompilersDLL/**.h"),
 	}
 
-	removefiles {
-		path.join(GLSLANG, "glslang/OSDependent/Unix/main.cpp"),
-		path.join(GLSLANG, "glslang/OSDependent/Windows/main.cpp"),
-	}
-
 	configuration { "windows" }
 		removefiles {
 			path.join(GLSLANG, "glslang/OSDependent/Unix/**.cpp"),
diff --git a/tools/shaderc/shaderc_metal.cpp b/tools/shaderc/shaderc_metal.cpp
index b98b0a595..edb3e6a5a 100644
--- a/tools/shaderc/shaderc_metal.cpp
+++ b/tools/shaderc/shaderc_metal.cpp
@@ -138,6 +138,15 @@ namespace bgfx { namespace metal
 		0,     // maxTaskWorkGroupSizeY_NV
 		0,     // maxTaskWorkGroupSizeZ_NV
 		0,     // maxMeshViewCountNV
+		0,     // maxMeshOutputVerticesEXT
+		0,     // maxMeshOutputPrimitivesEXT
+		0,     // maxMeshWorkGroupSizeX_EXT
+		0,     // maxMeshWorkGroupSizeY_EXT
+		0,     // maxMeshWorkGroupSizeZ_EXT
+		0,     // maxTaskWorkGroupSizeX_EXT
+		0,     // maxTaskWorkGroupSizeY_EXT
+		0,     // maxTaskWorkGroupSizeZ_EXT
+		0,     // maxMeshViewCountEXT
 		0,     // maxDualSourceDrawBuffersEXT
 
 		{ // limits
diff --git a/tools/shaderc/shaderc_spirv.cpp b/tools/shaderc/shaderc_spirv.cpp
index e305c0f15..21885171e 100644
--- a/tools/shaderc/shaderc_spirv.cpp
+++ b/tools/shaderc/shaderc_spirv.cpp
@@ -156,6 +156,15 @@ namespace bgfx { namespace spirv
 		0,     // maxTaskWorkGroupSizeY_NV
 		0,     // maxTaskWorkGroupSizeZ_NV
 		0,     // maxMeshViewCountNV
+		0,     // maxMeshOutputVerticesEXT
+		0,     // maxMeshOutputPrimitivesEXT
+		0,     // maxMeshWorkGroupSizeX_EXT
+		0,     // maxMeshWorkGroupSizeY_EXT
+		0,     // maxMeshWorkGroupSizeZ_EXT
+		0,     // maxTaskWorkGroupSizeX_EXT
+		0,     // maxTaskWorkGroupSizeY_EXT
+		0,     // maxTaskWorkGroupSizeZ_EXT
+		0,     // maxMeshViewCountEXT
 		0,     // maxDualSourceDrawBuffersEXT
 
 		{ // limits