Renderable Metal textures are handled differently depending on
whether the GPU uses a unified memory architecture (no physical
distinction between VRAM and system RAM, CPU and GPU share the
memory bus) or not. (Traditional discrete GPU with its own VRAM)
In the discrete GPU case, textures must be explicitly
synchronised to the CPU or the GPU before use after being
modified by the other. In this case, we sync after the PV
graphics framework has rendered the next frame into the
texture using the GPU so that we can read out its contents using
the CPU. This fixes the issue where the guest screen stayed
black on AMD Radeon GPUs.
Signed-off-by: Phil Dennis-Jordan <p...@philjordan.eu>
---
hw/display/apple-gfx.h | 1 +
hw/display/apple-gfx.m | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/hw/display/apple-gfx.h b/hw/display/apple-gfx.h
index 9d6d40795e..995ecf7f4a 100644
--- a/hw/display/apple-gfx.h
+++ b/hw/display/apple-gfx.h
@@ -43,6 +43,7 @@ struct AppleGFXState {
/* The following fields should only be accessed from render_queue: */
bool gfx_update_requested;
bool new_frame_ready;
+ bool using_managed_texture_storage;
int32_t pending_frames;
void *vram;
DisplaySurface *surface;
diff --git a/hw/display/apple-gfx.m b/hw/display/apple-gfx.m
index bc9722b420..801ae4ad51 100644
--- a/hw/display/apple-gfx.m
+++ b/hw/display/apple-gfx.m
@@ -125,7 +125,12 @@ static void apple_gfx_render_new_frame(AppleGFXState *s)
return;
}
[texture retain];
-
+ if (s->using_managed_texture_storage) {
+ /* "Managed" textures exist in both VRAM and RAM and must be synced. */
+ id<MTLBlitCommandEncoder> blit = [command_buffer blitCommandEncoder];
+ [blit synchronizeResource:texture];
+ [blit endEncoding];
+ }
[command_buffer retain];
[command_buffer addCompletedHandler:
^(id<MTLCommandBuffer> cb)
@@ -268,6 +273,9 @@ static void set_mode(AppleGFXState *s, uint32_t width,
uint32_t height)
texture = [s->mtl newTextureWithDescriptor:textureDescriptor];
}
+ s->using_managed_texture_storage =
+ (texture.storageMode == MTLStorageModeManaged);
+
dispatch_sync(s->render_queue,
^{
id<MTLTexture> old_texture = nil;
--
2.39.3 (Apple Git-146)
