[patch] vanilla-shaderc.patch

vanilla-shaderc.patch (text/plain), 2.87 KB, created by Alex Barker on 2024-07-02 05:29:42 UTC

--- /src/util/gpu_device.cpp    2024-07-01 22:08:26.195708463 -0700
+++ /src/util/gpu_device.cpp    2024-07-01 22:11:36.615636126 -0700
@@ -1127,7 +1127,7 @@
   X(shaderc_compile_options_set_generate_debug_info)                                                                   \
   X(shaderc_compile_options_set_optimization_level)                                                                    \
   X(shaderc_compile_options_set_target_env)                                                                            \
-  X(shaderc_compilation_status_to_string)                                                                              \
+  X(shaderc_result_get_compilation_status)                                                                             \
   X(shaderc_compile_into_spv)                                                                                          \
   X(shaderc_result_release)                                                                                            \
   X(shaderc_result_get_length)                                                                                         \
@@ -1324,22 +1324,19 @@
 
   dyn_libs::shaderc_compile_options_set_source_language(options, shaderc_source_language_glsl);
   dyn_libs::shaderc_compile_options_set_target_env(options, shaderc_target_env_vulkan, 0);
-  dyn_libs::shaderc_compile_options_set_generate_debug_info(options, m_debug_device,
-                                                            m_debug_device && nonsemantic_debug_info);
+  dyn_libs::shaderc_compile_options_set_generate_debug_info(options);
   dyn_libs::shaderc_compile_options_set_optimization_level(
     options, optimization ? shaderc_optimization_level_performance : shaderc_optimization_level_zero);
 
-  shaderc_compilation_result_t result;
-  const shaderc_compilation_status status = dyn_libs::shaderc_compile_into_spv(
+  shaderc_compilation_result_t result = dyn_libs::shaderc_compile_into_spv(
     dyn_libs::s_shaderc_compiler, source.data(), source.length(), stage_kinds[static_cast<size_t>(stage)], "source",
-    entry_point, options, &result);
+    entry_point, options);
+  shaderc_compilation_status status = dyn_libs::shaderc_result_get_compilation_status(result);
   if (status != shaderc_compilation_status_success)
   {
     const std::string_view errors(result ? dyn_libs::shaderc_result_get_error_message(result) : "null result object");
-    Error::SetStringFmt(error, "Failed to compile shader to SPIR-V: {}\n{}",
-                        dyn_libs::shaderc_compilation_status_to_string(status), errors);
-    ERROR_LOG("Failed to compile shader to SPIR-V: {}\n{}", dyn_libs::shaderc_compilation_status_to_string(status),
-              errors);
+    Error::SetStringFmt(error, "Failed to compile shader to SPIR-V: {}", errors);
+    ERROR_LOG("Failed to compile shader to SPIR-V: {}", errors);
     DumpBadShader(source, errors);
   }
   else