godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #80034 from darksylinc/matias-fixes

Browse Source 
Fix uninitialized variable ending up sent to Vulkan
This commit is contained in:
Clay John 2023-07-30 16:46:26 +02:00 committed by GitHub
commit 262d1eaa63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/vulkan/rendering_device_vulkan.cpp
View File

@ -4687,7 +4687,7 @@ Vector<uint8_t> RenderingDeviceVulkan::shader_compile_binary_from_spirv(const Ve
"Number of uniform sets is larger than what is supported by the hardware (" + itos(limits.maxBoundDescriptorSets) + ")."); "Number of uniform sets is larger than what is supported by the hardware (" + itos(limits.maxBoundDescriptorSets) + ").");
// Collect reflection data into binary data. // Collect reflection data into binary data.
RenderingDeviceVulkanShaderBinaryData binary_data; RenderingDeviceVulkanShaderBinaryData binary_data{};
Vector<Vector<RenderingDeviceVulkanShaderBinaryDataBinding>> uniform_info; // Set bindings. Vector<Vector<RenderingDeviceVulkanShaderBinaryDataBinding>> uniform_info; // Set bindings.
Vector<RenderingDeviceVulkanShaderBinarySpecializationConstant> specialization_constants; Vector<RenderingDeviceVulkanShaderBinarySpecializationConstant> specialization_constants;
{ {

2
servers/rendering/renderer_rd/shader_rd.cpp
View File

@ -382,7 +382,7 @@ String ShaderRD::_version_get_sha1(Version *p_version) const {
} }
static const char *shader_file_header = "GDSC"; static const char *shader_file_header = "GDSC";
static const uint32_t cache_file_version = 2; static const uint32_t cache_file_version = 3;
bool ShaderRD::_load_from_cache(Version *p_version) { bool ShaderRD::_load_from_cache(Version *p_version) {
String sha1 = _version_get_sha1(p_version); String sha1 = _version_get_sha1(p_version);