From 3e4f4c41d930546b248fe080ca2ea4a77a7b8d56 Mon Sep 17 00:00:00 2001 From: Konrad Dysput Date: Fri, 6 Sep 2024 18:35:17 +0200 Subject: [PATCH 1/2] Add missing bundle and missing configuration --- Mac/Backtrace-Unity-Mac-bundle.bundle/Contents.meta | 8 ++++++++ .../Contents/Info.plist.meta | 7 +++++++ Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/MacOS.meta | 8 ++++++++ .../Contents/MacOS/Backtrace-Unity-Mac-bundle.meta | 7 +++++++ .../Contents/_CodeSignature.meta | 8 ++++++++ .../Contents/_CodeSignature/CodeResources.meta | 7 +++++++ Runtime/Model/BacktraceConfiguration.cs | 4 ++-- 7 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 Mac/Backtrace-Unity-Mac-bundle.bundle/Contents.meta create mode 100644 Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/Info.plist.meta create mode 100644 Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/MacOS.meta create mode 100644 Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/MacOS/Backtrace-Unity-Mac-bundle.meta create mode 100644 Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/_CodeSignature.meta create mode 100644 Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/_CodeSignature/CodeResources.meta diff --git a/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents.meta b/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents.meta new file mode 100644 index 00000000..8c5780a6 --- /dev/null +++ b/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd0f2aac14e264a858422ddf8561299d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/Info.plist.meta b/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/Info.plist.meta new file mode 100644 index 00000000..4b4e9eb3 --- /dev/null +++ b/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/Info.plist.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a6a00695da8bf484b868522b90824dee +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/MacOS.meta b/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/MacOS.meta new file mode 100644 index 00000000..ddfb7b86 --- /dev/null +++ b/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/MacOS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f2c5ef9010e6a4e6688d126ecfbb0c84 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/MacOS/Backtrace-Unity-Mac-bundle.meta b/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/MacOS/Backtrace-Unity-Mac-bundle.meta new file mode 100644 index 00000000..977d2f20 --- /dev/null +++ b/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/MacOS/Backtrace-Unity-Mac-bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 411ce42ee76114a529892a83f71b32d8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/_CodeSignature.meta b/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/_CodeSignature.meta new file mode 100644 index 00000000..4c5ae7d9 --- /dev/null +++ b/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/_CodeSignature.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eefe3b4bc026b4f14ab609490a0c6fc0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/_CodeSignature/CodeResources.meta b/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/_CodeSignature/CodeResources.meta new file mode 100644 index 00000000..636b1fd0 --- /dev/null +++ b/Mac/Backtrace-Unity-Mac-bundle.bundle/Contents/_CodeSignature/CodeResources.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 480640ac28a9543ee84e5001e914bb06 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Model/BacktraceConfiguration.cs b/Runtime/Model/BacktraceConfiguration.cs index 1dc4b294..e9763f0d 100644 --- a/Runtime/Model/BacktraceConfiguration.cs +++ b/Runtime/Model/BacktraceConfiguration.cs @@ -130,7 +130,7 @@ public class BacktraceConfiguration : ScriptableObject /// Capture native NDK Crashes. /// [Tooltip("Capture native NDK Crashes (ANDROID API 21+)")] -#elif UNITY_IOS || UNITY_STANDALONE_WIN || UNITY_GAMECORE_XBOXSERIES +#elif UNITY_IOS || UNITY_STANDALONE_WIN || UNITY_GAMECORE_XBOXSERIES || UNITY_STANDALONE_OSX /// /// Capture native crashes. /// @@ -453,4 +453,4 @@ public BacktraceCredentials ToCredentials() return new BacktraceCredentials(ServerUrl); } } -} \ No newline at end of file +} From 835eebe8448c26e277ecf1db87da1780820e3cd3 Mon Sep 17 00:00:00 2001 From: Konrad Dysput Date: Fri, 6 Sep 2024 19:10:22 +0200 Subject: [PATCH 2/2] Cache texture before re-rendering --- Runtime/Model/Database/BacktraceDatabaseAttachmentManager.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Runtime/Model/Database/BacktraceDatabaseAttachmentManager.cs b/Runtime/Model/Database/BacktraceDatabaseAttachmentManager.cs index 6900322b..d3ea44c8 100644 --- a/Runtime/Model/Database/BacktraceDatabaseAttachmentManager.cs +++ b/Runtime/Model/Database/BacktraceDatabaseAttachmentManager.cs @@ -121,6 +121,8 @@ private string GetScreenshotPath(string dataPrefix) // Create a render texture to render into RenderTexture rt = RenderTexture.GetTemporary(targetWidth, targetHeight); + RenderTexture previousActiveRT = RenderTexture.active; + if (SystemInfo.graphicsUVStartsAtTop) { Graphics.Blit(screenTexture, rt, new Vector2(1.0f, -1.0f), new Vector2(0.0f, 1.0f)); @@ -130,7 +132,6 @@ private string GetScreenshotPath(string dataPrefix) Graphics.Blit(screenTexture, rt); } - RenderTexture previousActiveRT = RenderTexture.active; RenderTexture.active = rt; // Create a texture & read data from the active RenderTexture