LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-18 11:44:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

metal: fix uniform data corruption

Browse Source 
The wrong buffer binding offset was being used in 2/3rds of frames.
This commit is contained in:
Sasha Szpakowski
2024-03-10 13:38:28 -03:00
parent 75fd2fa06e
commit 9e00ce0973
6 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/metal/Graphics.mm
+16 -5
View File
@@ -280,6 +280,7 @@ Graphics::Graphics()
, attachmentStoreActions()
, renderBindings()
, uniformBufferOffset(0)
, uniformBufferGPUStart(0)
, defaultAttributesBuffer(nullptr)
, families()
{ @autoreleasepool {
@@ -1035,14 +1036,19 @@ bool Graphics::applyShaderUniforms(id<MTLComputeCommandEncoder> encoder, love::g
if (uniformBuffer->getSize() < uniformBufferOffset + size)
{
size_t newsize = uniformBuffer->getSize() * 2;
if (uniformBufferOffset > 0)
uniformBuffer->nextFrame();
uniformBuffer->release();
uniformBuffer = CreateStreamBuffer(device, BUFFERUSAGE_VERTEX, newsize);
uniformBuffer = CreateStreamBuffer(device, BUFFERUSAGE_UNIFORM, newsize);
uniformBufferData = {};
uniformBufferOffset = 0;
}
if (uniformBufferData.data == nullptr)
{
uniformBufferData = uniformBuffer->map(uniformBuffer->getSize());
uniformBufferGPUStart = uniformBuffer->getGPUReadOffset();
}
memcpy(uniformBufferData.data + uniformBufferOffset, bufferdata, size);
@@ -1050,7 +1056,7 @@ bool Graphics::applyShaderUniforms(id<MTLComputeCommandEncoder> encoder, love::g
int uniformindex = Shader::getUniformBufferBinding();
auto &bindings = renderBindings;
setBuffer(encoder, bindings, uniformindex, buffer, uniformBufferOffset);
setBuffer(encoder, bindings, uniformindex, buffer, uniformBufferGPUStart + uniformBufferOffset);
uniformBufferOffset += alignUp(size, alignment);
@@ -1141,14 +1147,19 @@ void Graphics::applyShaderUniforms(id<MTLRenderCommandEncoder> renderEncoder, lo
if (uniformBuffer->getSize() < uniformBufferOffset + size)
{
size_t newsize = uniformBuffer->getSize() * 2;
if (uniformBufferOffset > 0)
uniformBuffer->nextFrame();
uniformBuffer->release();
uniformBuffer = CreateStreamBuffer(device, BUFFERUSAGE_VERTEX, newsize);
uniformBuffer = CreateStreamBuffer(device, BUFFERUSAGE_UNIFORM, newsize);
uniformBufferData = {};
uniformBufferOffset = 0;
}
if (uniformBufferData.data == nullptr)
{
uniformBufferData = uniformBuffer->map(uniformBuffer->getSize());
uniformBufferGPUStart = uniformBuffer->getGPUReadOffset();
}
memcpy(uniformBufferData.data + uniformBufferOffset, bufferdata, size);
@@ -1156,8 +1167,8 @@ void Graphics::applyShaderUniforms(id<MTLRenderCommandEncoder> renderEncoder, lo
int uniformindex = Shader::getUniformBufferBinding();
auto &bindings = renderBindings;
setBuffer(renderEncoder, bindings, SHADERSTAGE_VERTEX, uniformindex, buffer, uniformBufferOffset);
setBuffer(renderEncoder, bindings, SHADERSTAGE_PIXEL, uniformindex, buffer, uniformBufferOffset);
setBuffer(renderEncoder, bindings, SHADERSTAGE_VERTEX, uniformindex, buffer, uniformBufferGPUStart + uniformBufferOffset);
setBuffer(renderEncoder, bindings, SHADERSTAGE_PIXEL, uniformindex, buffer, uniformBufferGPUStart + uniformBufferOffset);
uniformBufferOffset += alignUp(size, alignment);