Merge branch '12.0-development' into metal

This commit is contained in:
Alex Szpakowski
2021-03-26 21:42:08 -03:00
51 changed files with 1415 additions and 828 deletions
+13 -1
View File
@@ -71,7 +71,7 @@ Buffer::Buffer(love::graphics::Graphics *gfx, id<MTLDevice> device, const Settin
if (buffer == nil)
throw love::Exception("Could not create buffer (out of VRAM?)");
if (typeFlags & TYPEFLAG_TEXEL)
if (usageFlags & BUFFERUSAGEFLAG_TEXEL)
{
if (@available(iOS 12, macOS 10.14, *))
{
@@ -169,6 +169,18 @@ void Buffer::fill(size_t offset, size_t size, const void *data)
size:size];
}}
void Buffer::copyTo(love::graphics::Buffer *dest, size_t sourceoffset, size_t destoffset, size_t size)
{ @autoreleasepool {
auto gfx = Graphics::getInstance();
auto encoder = gfx->useBlitEncoder();
[encoder copyFromBuffer:buffer
sourceOffset:sourceoffset
toBuffer:((Buffer *) dest)->buffer
destinationOffset:destoffset
size:size];
}}
} // metal
} // graphics
} // love