Browse Source

shaderc: Updated to new glslang.

Бранимир Караџић 3 years ago
parent
commit
24c5c2f096
3 changed files with 20 additions and 5 deletions
  1. 2 5
      scripts/shaderc.lua
  2. 9 0
      tools/shaderc/shaderc_metal.cpp
  3. 9 0
      tools/shaderc/shaderc_spirv.cpp

+ 2 - 5
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"),

+ 9 - 0
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

+ 9 - 0
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