[Bf-blender-cvs] [377b81ac073] master: Fix compilation issue in MTLQueryPool::allocate_buffer.
Jeroen Bakker
noreply at git.blender.org
Mon Aug 29 08:37:27 CEST 2022
Commit: 377b81ac0733ff25dba54f9fce6e99f66073e761
Author: Jeroen Bakker
Date: Mon Aug 29 08:34:47 2022 +0200
Branches: master
https://developer.blender.org/rB377b81ac0733ff25dba54f9fce6e99f66073e761
Fix compilation issue in MTLQueryPool::allocate_buffer.
This compilation issue happened due to multiple patches being handled at the same
time one overwriting a correction of the other.
===================================================================
M source/blender/gpu/metal/mtl_query.mm
===================================================================
diff --git a/source/blender/gpu/metal/mtl_query.mm b/source/blender/gpu/metal/mtl_query.mm
index f574140531d..73e5f72dc5b 100644
--- a/source/blender/gpu/metal/mtl_query.mm
+++ b/source/blender/gpu/metal/mtl_query.mm
@@ -30,7 +30,7 @@ void MTLQueryPool::allocate_buffer()
{
/* Allocate Metal buffer for visibility results. */
size_t buffer_size_in_bytes = VISIBILITY_COUNT_PER_BUFFER * VISIBILITY_RESULT_SIZE_IN_BYTES;
- gpu::MTLBuffer *buffer = MTLContext::get_global_memory_manager().allocate_buffer(
+ gpu::MTLBuffer *buffer = MTLContext::get_global_memory_manager().allocate(
buffer_size_in_bytes, true);
BLI_assert(buffer);
buffer_.append(buffer);
More information about the Bf-blender-cvs
mailing list