utmapp/UTM
1
0
Fork 0
mirror of https://github.com/utmapp/UTM.git synced 2026-10-12 02:24:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/ios-rosetta

Browse Source
This commit is contained in:
osy
2022-12-30 23:01:38 -08:00
committed by GitHub
parent 803b39c9dc 115364c089
commit 305cfd5cd1
4 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Platform/iOS/Display/VMDisplayMetalViewController.m
+3 -2
View File
@@ -88,8 +88,9 @@
// Initialize our renderer with the view size
CGSize drawableSize = self.view.bounds.size;
self.mtkView.drawableSize = drawableSize;
self.renderer.preferredFramesPerSecond = [self integerForSetting:@"QEMURendererFPSLimit"];
[self.renderer mtkView:self.mtkView drawableSizeWillChange:drawableSize];
if ([self integerForSetting:@"QEMURendererFPSLimit"] > 0) {
self.mtkView.preferredFramesPerSecond = [self integerForSetting:@"QEMURendererFPSLimit"];
}
[self.renderer changeUpscaler:self.delegate.qemuDisplayUpscaler
downscaler:self.delegate.qemuDisplayDownscaler];
Platform/macOS/Display/VMDisplayQemuMetalWindowController.swift
+3 -2
View File
@@ -82,8 +82,9 @@ class VMDisplayQemuMetalWindowController: VMDisplayQemuWindowController {
logger.critical("Failed to create renderer.")
return
}
renderer.preferredFramesPerSecond = rendererFpsLimit
renderer.mtkView(metalView, drawableSizeWillChange: metalView.drawableSize)
if rendererFpsLimit > 0 {
metalView.preferredFramesPerSecond = rendererFpsLimit
}
renderer.changeUpscaler(displayConfig?.upscalingFilter.metalSamplerMinMagFilter ?? .linear, downscaler: displayConfig?.downscalingFilter.metalSamplerMinMagFilter ?? .linear)
renderer.source = vmDisplay // can be nil if primary
metalView.delegate = renderer
UTM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+1 -1
View File
@@ -15,7 +15,7 @@
"location" : "https://github.com/utmapp/CocoaSpice.git",
"state" : {
"branch" : "main",
"revision" : "89fabc654b65568fae5192c1547023cfe333c2df"
"revision" : "3d34a2ba65c4feb741275ad937fc4efe20ffbaac"
}
},
{
patches/qemu-7.2.0-utm.patch
+39
View File
@@ -582,6 +582,45 @@ index 8d2248bb3f..8283a9b761 100644
int hvf_arch_init(void)
{
return 0;
=======
From c874e68e5a1635326f8a2f52320b8dbe82f6be51 Mon Sep 17 00:00:00 2001
From: osy <[email protected]>
Date: Fri, 30 Dec 2022 20:24:00 -0800
Subject: [PATCH] tcti: disable TARGET_TB_PCREL for TCTI
It is currently not supported.
---
target/arm/cpu-param.h | 2 ++
target/i386/cpu-param.h | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/target/arm/cpu-param.h b/target/arm/cpu-param.h
index 53cac9c89b..6c4af8f0d2 100644
--- a/target/arm/cpu-param.h
+++ b/target/arm/cpu-param.h
@@ -31,7 +31,9 @@
# define TARGET_PAGE_BITS_VARY
# define TARGET_PAGE_BITS_MIN 10
+#ifndef CONFIG_TCG_THREADED_INTERPRETER
# define TARGET_TB_PCREL 1
+#endif
/*
* Cache the attrs and shareability fields from the page table entry.
diff --git a/target/i386/cpu-param.h b/target/i386/cpu-param.h
index f579b16bd2..0975265ff3 100644
--- a/target/i386/cpu-param.h
+++ b/target/i386/cpu-param.h
@@ -25,7 +25,7 @@
#define TARGET_PAGE_BITS 12
#define NB_MMU_MODES 5
-#ifndef CONFIG_USER_ONLY
+#if !defined(CONFIG_USER_ONLY) && !defined(CONFIG_TCG_THREADED_INTERPRETER)
# define TARGET_TB_PCREL 1
#endif
--
2.28.0