griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Metal: Add support for storage buffer copy_sub

Browse Source 
Authored by Apple: Michael Parkin-White

Pull Request: https://projects.blender.org/blender/blender/pulls/112638
This commit is contained in:
Jason Fielder
2023-09-20 23:59:08 +02:00
committed by Clément Foucault
parent 2c6f08ab16
commit 42ddeeadeb
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source/blender/gpu/metal/mtl_storage_buffer.mm
View File

@@ -247,13 +247,34 @@ void MTLStorageBuf::clear(uint32_t clear_value)
}
}
void MTLStorageBuf::copy_sub(VertBuf * /*src_*/,
uint /*dst_offset*/,
uint /*src_offset*/,
uint /*copy_size*/)
void MTLStorageBuf::copy_sub(VertBuf *src_, uint dst_offset, uint src_offset, uint copy_size)
{
/* TODO(Metal): Support Copy sub operation. */
MTL_LOG_WARNING("MTLStorageBuf::copy_sub not yet supported.");
MTLVertBuf *src = static_cast<MTLVertBuf *>(src_);
MTLStorageBuf *dst = this;
if (dst->metal_buffer_ == nullptr) {
dst->init();
}
if (src->vbo_ == nullptr) {
src->bind();
}
/* Fetch active context. */
MTLContext *ctx = static_cast<MTLContext *>(unwrap(GPU_context_active_get()));
BLI_assert(ctx);
/* Fetch Metal buffers. */
id<MTLBuffer> src_buf = src->vbo_->get_metal_buffer();
id<MTLBuffer> dst_buf = dst->metal_buffer_->get_metal_buffer();
BLI_assert(src_buf != nil);
BLI_assert(dst_buf != nil);
id<MTLBlitCommandEncoder> blit_encoder = ctx->main_command_buffer.ensure_begin_blit_encoder();
[blit_encoder copyFromBuffer:src_buf
sourceOffset:src_offset
toBuffer:dst_buf
destinationOffset:dst_offset
size:copy_size];
}
void MTLStorageBuf::read(void *data)

2
source/blender/gpu/metal/mtl_vertex_buffer.hh
View File

@@ -25,7 +25,7 @@ class MTLVertBuf : public VertBuf {
friend class MTLShader; /* For transform feedback. */
friend class MTLBatch;
friend class MTLContext; /* For transform feedback. */
friend class MTLStorageBuf; /* For bind as SSBO resource access. */
friend class MTLStorageBuf; /* For bind as SSBO resource access and copy sub. */
private:
/** Metal buffer allocation. **/