godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Disable smolv and change the shader hash when SPIR-V debug info is enabled.

Browse Source
This commit is contained in:
Dario
2025-08-27 11:58:28 -03:00
parent 4ebf67c12d
commit e137c882c0
5 changed files with 71 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/vulkan/rendering_shader_container_vulkan.cpp
View File

@@ -30,9 +30,7 @@
#include "rendering_shader_container_vulkan.h"
#if RENDERING_SHADER_CONTAINER_VULKAN_SMOLV
#include "thirdparty/misc/smolv.h"
#endif
// RenderingShaderContainerVulkan
@@ -50,44 +48,50 @@ bool RenderingShaderContainerVulkan::_set_code_from_spirv(const Vector<Rendering
PackedByteArray code_bytes;
shaders.resize(p_spirv.size());
for (int64_t i = 0; i < p_spirv.size(); i++) {
#if RENDERING_SHADER_CONTAINER_VULKAN_SMOLV
// Encode into smolv.
smolv::ByteArray smolv_bytes;
bool smolv_encoded = smolv::Encode(p_spirv[i].spirv.ptr(), p_spirv[i].spirv.size(), smolv_bytes, smolv::kEncodeFlagStripDebugInfo);
ERR_FAIL_COND_V_MSG(!smolv_encoded, false, "Failed to compress SPIR-V into smolv.");
code_bytes.resize(smolv_bytes.size());
memcpy(code_bytes.ptrw(), smolv_bytes.data(), code_bytes.size());
#else
code_bytes.resize(p_spirv[i].spirv.size());
memcpy(code_bytes.ptrw(), p_spirv[i].spirv.ptr(), code_bytes.size());
#endif
RenderingShaderContainer::Shader &shader = shaders.ptrw()[i];
#if RENDERING_SHADER_CONTAINER_VULKAN_COMPRESSION
uint32_t compressed_size = 0;
shader.code_decompressed_size = code_bytes.size();
shader.code_compressed_bytes.resize(code_bytes.size());
bool compressed = compress_code(code_bytes.ptr(), code_bytes.size(), shader.code_compressed_bytes.ptrw(), &compressed_size, &shader.code_compression_flags);
ERR_FAIL_COND_V_MSG(!compressed, false, vformat("Failed to compress native code to native for SPIR-V #%d.", i));
if (debug_info_enabled) {
// Store SPIR-V as is when debug info is required.
shader.code_compressed_bytes = p_spirv[i].spirv;
shader.code_compression_flags = 0;
shader.code_decompressed_size = 0;
} else {
// Encode into smolv.
smolv::ByteArray smolv_bytes;
bool smolv_encoded = smolv::Encode(p_spirv[i].spirv.ptr(), p_spirv[i].spirv.size(), smolv_bytes, smolv::kEncodeFlagStripDebugInfo);
ERR_FAIL_COND_V_MSG(!smolv_encoded, false, "Failed to compress SPIR-V into smolv.");
code_bytes.resize(smolv_bytes.size());
memcpy(code_bytes.ptrw(), smolv_bytes.data(), code_bytes.size());
// Compress.
uint32_t compressed_size = 0;
shader.code_decompressed_size = code_bytes.size();
shader.code_compressed_bytes.resize(code_bytes.size());
bool compressed = compress_code(code_bytes.ptr(), code_bytes.size(), shader.code_compressed_bytes.ptrw(), &compressed_size, &shader.code_compression_flags);
ERR_FAIL_COND_V_MSG(!compressed, false, vformat("Failed to compress native code to native for SPIR-V #%d.", i));
shader.code_compressed_bytes.resize(compressed_size);
// Indicate it uses smolv for compression.
shader.code_compression_flags |= COMPRESSION_FLAG_SMOLV;
}
shader.code_compressed_bytes.resize(compressed_size);
#else
shader.code_decompressed_size = 0;
shader.code_compression_flags = 0;
shader.code_compressed_bytes = code_bytes;
#endif
shader.shader_stage = p_spirv[i].shader_stage;
}
return true;
}
RenderingShaderContainerVulkan::RenderingShaderContainerVulkan(bool p_debug_info_enabled) {
debug_info_enabled = p_debug_info_enabled;
}
// RenderingShaderContainerFormatVulkan
Ref<RenderingShaderContainer> RenderingShaderContainerFormatVulkan::create_container() const {
return memnew(RenderingShaderContainerVulkan);
return memnew(RenderingShaderContainerVulkan(debug_info_enabled));
}
RenderingDeviceCommons::ShaderLanguageVersion RenderingShaderContainerFormatVulkan::get_shader_language_version() const {
@@ -98,6 +102,10 @@ RenderingDeviceCommons::ShaderSpirvVersion RenderingShaderContainerFormatVulkan:
return SHADER_SPIRV_VERSION_1_3;
}
void RenderingShaderContainerFormatVulkan::set_debug_info_enabled(bool p_debug_info_enabled) {
debug_info_enabled = p_debug_info_enabled;
}
RenderingShaderContainerFormatVulkan::RenderingShaderContainerFormatVulkan() {}
RenderingShaderContainerFormatVulkan::~RenderingShaderContainerFormatVulkan() {}