mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

macOS/iOS fixed a rendering hang with JUCE_COREGRAPHICS_RENDER_WITH_MULTIPLE_PAINT_CALLS

Browse source
This commit is contained in:
Tom Poole 2022-06-28 09:42:11 +01:00
parent bd7166893f
commit a20e8d8592
1 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
modules/juce_gui_basics/native/juce_mac_CGMetalLayerRenderer.h
View file

@ -45,8 +45,6 @@ public:
layer.allowsNextDrawableTimeout = NO;
commandQueue.reset ([device.get() newCommandQueue]);
memoryBlitEvent.reset ([device.get() newSharedEvent]);
}
~CoreGraphicsMetalLayerRenderer()
@ -63,14 +61,21 @@ public:
Callback&& drawRectWithContext,
const RectangleList<float>& dirtyRegions)
{
if (resources != nullptr)
if (memoryBlitCommandBuffer != nullptr)
{
// If we haven't finished blitting the CPU texture to the GPU then
// report that we have been unable to draw anything.
if (memoryBlitEvent.get().signaledValue != memoryBlitCounter + 1)
return false;
++memoryBlitCounter;
switch ([memoryBlitCommandBuffer.get() status])
{
case MTLCommandBufferStatusNotEnqueued:
case MTLCommandBufferStatusEnqueued:
case MTLCommandBufferStatusCommitted:
case MTLCommandBufferStatusScheduled:
// If we haven't finished blitting the CPU texture to the GPU then
// report that we have been unable to draw anything.
return false;
case MTLCommandBufferStatusCompleted:
case MTLCommandBufferStatusError:
break;
}
}
layer.contentsScale = scaleFactor;
@ -131,10 +136,6 @@ public:
destinationOrigin: MTLOrigin{}];
[blitCommandEncoder endEncoding];
// Signal that the GPU has finished using the CPU texture
[memoryBlitCommandBuffer.get() encodeSignalEvent: memoryBlitEvent.get()
value: memoryBlitCounter + 1];
[memoryBlitCommandBuffer.get() addScheduledHandler: ^(id<MTLCommandBuffer>)
{
// We're on a Metal thread, so we can make a blocking nextDrawable call
@ -351,9 +352,7 @@ private:
ObjCObjectHandle<id<MTLDevice>> device;
ObjCObjectHandle<id<MTLCommandQueue>> commandQueue;
ObjCObjectHandle<id<MTLCommandBuffer>> memoryBlitCommandBuffer;
ObjCObjectHandle<id<MTLSharedEvent>> memoryBlitEvent;
uint64_t memoryBlitCounter = 0;
std::atomic<bool> stopGpuCommandSubmission { false };
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CoreGraphicsMetalLayerRenderer)