From 695a4bd1a96982a3b6e5ae370b766b329101b124 Mon Sep 17 00:00:00 2001 From: Belinsky-L-V Date: Fri, 22 Jan 2021 17:04:54 +0100 Subject: [PATCH] Backends: Metal: Fixed texture storage mode when building on Mac Catalyst. (#3748) --- backends/imgui_impl_metal.mm | 3 ++- docs/CHANGELOG.txt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backends/imgui_impl_metal.mm b/backends/imgui_impl_metal.mm index 8a6f7e7d..d368daad 100644 --- a/backends/imgui_impl_metal.mm +++ b/backends/imgui_impl_metal.mm @@ -11,6 +11,7 @@ // CHANGELOG // (minor and older changes stripped away, please see git history for details) +// 2021-01-25: Metal: Fixed texture storage mode when building on Mac Catalyst. // 2019-05-29: Metal: Added support for large mesh (64K+ vertices), enable ImGuiBackendFlags_RendererHasVtxOffset flag. // 2019-04-30: Metal: Added support for special ImDrawCallback_ResetRenderState callback to reset render state. // 2019-02-11: Metal: Projecting clipping rectangles correctly using draw_data->FramebufferScale to allow multi-viewports for retina display. @@ -238,7 +239,7 @@ void ImGui_ImplMetal_DestroyDeviceObjects() height:(NSUInteger)height mipmapped:NO]; textureDescriptor.usage = MTLTextureUsageShaderRead; -#if TARGET_OS_OSX +#if TARGET_OS_OSX || TARGET_OS_MACCATALYST textureDescriptor.storageMode = MTLStorageModeManaged; #else textureDescriptor.storageMode = MTLStorageModeShared; diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 1b66f1b9..b03fe7c3 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -37,8 +37,9 @@ HOW TO UPDATE? Other Changes: -- ImDrawList: fixed AddCircle()/AddCircleFilled() with (rad > 0.0f && rad < 1.0f && num_segments == 0). (#3738) +- ImDrawList: Fixed AddCircle()/AddCircleFilled() with (rad > 0.0f && rad < 1.0f && num_segments == 0). (#3738) Would lead to a buffer read overflow. +- Backends: Metal: Fixed texture storage mode when building on Mac Catalyst. (#3748) [@Belinsky-L-V] -----------------------------------------------------------------------