noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #120589 from stuartcarnie/metal_copy_queue_fix

Browse Source 
Metal: Fix buffer overrun
This commit is contained in:
Thaddeus Crews
2026-06-24 10:16:10 -05:00
parent 7b594b5963 d0f493b955
commit fd4c9db2a2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/metal/rendering_device_driver_metal.h
+4 -3
View File
@@ -117,10 +117,11 @@ protected:
return copy_queue_buffer.get()->length() - copy_queue_buffer_offset;
}
/// Marks p_size bytes as consumed from the copy queue buffer, aligning the offset to 16 bytes.
/// Marks p_size bytes as consumed from the copy queue buffer, aligning the new offset to 16 bytes.
_FORCE_INLINE_ void _copy_queue_buffer_consume(NS::UInteger p_size) {
NS::UInteger aligned_offset = round_up_to_alignment(copy_queue_buffer_offset, 16);
copy_queue_buffer_offset = aligned_offset + p_size;
// Round up the end of the consumed region so the next copy starts aligned and the offset
// never exceeds the buffer length (which would underflow _copy_queue_buffer_available()).
copy_queue_buffer_offset = round_up_to_alignment(copy_queue_buffer_offset + p_size, 16);
}
/// Returns a pointer to the current position in the copy queue buffer.