Skip to content

Force disable SPIRV debug info on D3D12. #111912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2025
Merged

Force disable SPIRV debug info on D3D12. #111912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion main/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ void Main::print_help(const char *p_binary) {
#ifdef DEBUG_ENABLED
print_help_option("--gpu-abort", "Abort on graphics API usage errors (usually validation layer errors). May help see the problem if your system freezes.\n", CLI_OPTION_AVAILABILITY_TEMPLATE_DEBUG);
#endif
print_help_option("--generate-spirv-debug-info", "Generate SPIR-V debug information. This allows source-level shader debugging with RenderDoc.\n");
print_help_option("--generate-spirv-debug-info", "Generate SPIR-V debug information (Vulkan only). This allows source-level shader debugging with RenderDoc.\n");
#if defined(DEBUG_ENABLED) || defined(DEV_ENABLED)
print_help_option("--extra-gpu-memory-tracking", "Enables additional memory tracking (see class reference for `RenderingDevice.get_driver_and_device_memory_report()` and linked methods). Currently only implemented for Vulkan. Enabling this feature may cause crashes on some systems due to buggy drivers or bugs in the Vulkan Loader. See https://github.com/godotengine/godot/issues/95967\n");
print_help_option("--accurate-breadcrumbs", "Force barriers between breadcrumbs. Useful for narrowing down a command causing GPU resets. Currently only implemented for Vulkan.\n");
Expand Down
13 changes: 11 additions & 2 deletions modules/glslang/register_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "register_types.h"

#include "core/config/engine.h"
#include "core/os/os.h"
#include "shader_compile.h"

GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wshadow")
Expand Down Expand Up @@ -71,8 +72,16 @@ Vector<uint8_t> compile_glslang_shader(RenderingDeviceCommons::ShaderStage p_sta
shader.setPreamble(preamble.c_str());
}

bool generate_spirv_debug_info = Engine::get_singleton()->is_generate_spirv_debug_info_enabled();
#ifdef D3D12_ENABLED
if (OS::get_singleton()->get_current_rendering_driver_name() == "d3d12") {
// SPIRV to DXIL conversion does not support debug info.
generate_spirv_debug_info = false;
}
#endif

EShMessages messages = (EShMessages)(EShMsgSpvRules | EShMsgVulkanRules);
if (Engine::get_singleton()->is_generate_spirv_debug_info_enabled()) {
if (generate_spirv_debug_info) {
messages = (EShMessages)(messages | EShMsgDebugInfo);
}
const int DefaultVersion = 100;
Expand Down Expand Up @@ -107,7 +116,7 @@ Vector<uint8_t> compile_glslang_shader(RenderingDeviceCommons::ShaderStage p_sta
spv::SpvBuildLogger logger;
glslang::SpvOptions spvOptions;

if (Engine::get_singleton()->is_generate_spirv_debug_info_enabled()) {
if (generate_spirv_debug_info) {
spvOptions.generateDebugInfo = true;
spvOptions.emitNonSemanticShaderDebugInfo = true;
spvOptions.emitNonSemanticShaderDebugSource = true;
Expand Down