diff options
| author | DeeJayLSP <djlsplays@gmail.com> | 2023-06-06 02:19:51 -0300 |
|---|---|---|
| committer | DeeJayLSP <djlsplays@gmail.com> | 2023-06-06 12:40:04 -0300 |
| commit | 1b642d283c8daf27a4d5141ed212b6568b9ad21b (patch) | |
| tree | 401c5ba01a1a0e57fae548a4da5d9d44de9c8825 /thirdparty/spirv-reflect/patches | |
| parent | e7d2e49688bdaec65e326e7b2bfcc0642b4f2a8d (diff) | |
| download | redot-engine-1b642d283c8daf27a4d5141ed212b6568b9ad21b.tar.gz | |
Update Vulkan and related libraries to 1.3.250.0
Diffstat (limited to 'thirdparty/spirv-reflect/patches')
| -rw-r--r-- | thirdparty/spirv-reflect/patches/specialization-constants.patch | 4 | ||||
| -rw-r--r-- | thirdparty/spirv-reflect/patches/zero-calloc.patch | 28 |
2 files changed, 2 insertions, 30 deletions
diff --git a/thirdparty/spirv-reflect/patches/specialization-constants.patch b/thirdparty/spirv-reflect/patches/specialization-constants.patch index b755950423..d066c03ce7 100644 --- a/thirdparty/spirv-reflect/patches/specialization-constants.patch +++ b/thirdparty/spirv-reflect/patches/specialization-constants.patch @@ -26,10 +26,10 @@ index 8c70ebecfb..c5ed7ab07d 100644 CHECKED_READU32(p_parser, p_node->word_offset + 2, p_node->result_id); } break; -- -+// -- GODOT begin -- + case SpvOpSpecConstantTrue: case SpvOpSpecConstantFalse: ++// -- GODOT begin -- - case SpvOpSpecConstant: + case SpvOpSpecConstant: { + CHECKED_READU32(p_parser, p_node->word_offset + 1, p_node->result_type_id); diff --git a/thirdparty/spirv-reflect/patches/zero-calloc.patch b/thirdparty/spirv-reflect/patches/zero-calloc.patch deleted file mode 100644 index 3ce2d08936..0000000000 --- a/thirdparty/spirv-reflect/patches/zero-calloc.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/thirdparty/spirv-reflect/spirv_reflect.c b/thirdparty/spirv-reflect/spirv_reflect.c -index c5ed7ab07d..f2be1f8cae 100644 ---- a/thirdparty/spirv-reflect/spirv_reflect.c -+++ b/thirdparty/spirv-reflect/spirv_reflect.c -@@ -3368,12 +3368,18 @@ static SpvReflectResult ParseExecutionModes( - } - for (size_t entry_point_idx = 0; entry_point_idx < p_module->entry_point_count; ++entry_point_idx) { - SpvReflectEntryPoint* p_entry_point = &p_module->entry_points[entry_point_idx]; -- p_entry_point->execution_modes = -- (SpvExecutionMode*)calloc(p_entry_point->execution_mode_count, sizeof(*p_entry_point->execution_modes)); -- if (IsNull(p_entry_point->execution_modes)) { -- SafeFree(indices); -- return SPV_REFLECT_RESULT_ERROR_ALLOC_FAILED; -+// -- GODOT begin -- -+ if (p_entry_point->execution_mode_count > 0) { -+// -- GODOT end -- -+ p_entry_point->execution_modes = -+ (SpvExecutionMode*)calloc(p_entry_point->execution_mode_count, sizeof(*p_entry_point->execution_modes)); -+ if (IsNull(p_entry_point->execution_modes)) { -+ SafeFree(indices); -+ return SPV_REFLECT_RESULT_ERROR_ALLOC_FAILED; -+ } -+// -- GODOT begin -- - } -+// -- GODOT end -- - } - - for (size_t node_idx = 0; node_idx < p_parser->node_count; ++node_idx) { |