fix: temporary fix for fps drop issue when starting stream with graph disabled

This commit is contained in:
Acaki committed 2025-07-19 20:05:17 +08:00
1 parent 4d45c538cc
commit d72930877a
2 files changed
+61 -36

No files matched your search

+1
View File
@@ -20,6 +20,7 @@ typedef void (^MetricsHandler)(int plotId, CFTimeInterval value);
@property (nonatomic) FloatBuffer * _Nonnull frametimes; @property (nonatomic) FloatBuffer * _Nonnull frametimes;
@property (nonatomic) BOOL enableGraphs; @property (nonatomic) BOOL enableGraphs;
@property (nonatomic) float graphOpacity; @property (nonatomic) float graphOpacity;
@property (nonatomic) int streamFps;
@property (nonatomic) BOOL imguiRunning; @property (nonatomic) BOOL imguiRunning;
@property (nonatomic) MetricsHandler _Nonnull metricsHandler; @property (nonatomic) MetricsHandler _Nonnull metricsHandler;
+60 -36
View File
@@ -30,6 +30,7 @@
_enableGraphs = enableGraphs; _enableGraphs = enableGraphs;
_graphOpacity = (float)(graphOpacity / 100.0); _graphOpacity = (float)(graphOpacity / 100.0);
_bounds = bounds; _bounds = bounds;
_streamFps = streamFps;
_device = MTLCreateSystemDefaultDevice(); _device = MTLCreateSystemDefaultDevice();
_commandQueue = [_device newCommandQueue]; _commandQueue = [_device newCommandQueue];
@@ -83,33 +84,45 @@
self.mtkView.device = self.device; self.mtkView.device = self.device;
self.mtkView.delegate = self; self.mtkView.delegate = self;
self.mtkView.preferredFramesPerSecond = 60; // ImGui overlay will always render at this rate self.mtkView.preferredFramesPerSecond = _streamFps; // Match the stream frame rate for proper display sync
self.mtkView.opaque = NO; self.mtkView.opaque = NO;
self.mtkView.enableSetNeedsDisplay = NO; self.mtkView.enableSetNeedsDisplay = NO;
if (_enableGraphs) { if (_enableGraphs) {
[self ImGui_Init]; [self ImGui_Init];
self.mtkView.paused = NO; self.mtkView.paused = NO;
self.mtkView.hidden = NO;
} }
else { else {
self.mtkView.paused = YES; // Keep Metal view running for display sync but don't initialize ImGui
self.mtkView.paused = NO;
self.mtkView.hidden = YES; // Hide but keep running for display sync
} }
} }
// start & stop are used to show/hide graphs when swiping stats in or out // start & stop are used to show/hide graphs when swiping stats in or out
-(void)start { -(void)start {
[self ImGui_Init];
if (_enableGraphs) { if (_enableGraphs) {
self.mtkView.paused = NO; [self ImGui_Init];
self.mtkView.hidden = NO;
} else {
// Keep running for display sync but stay hidden
self.mtkView.hidden = YES;
} }
self.mtkView.paused = NO;
} }
-(void)show { -(void)show {
[self.mtkView setHidden:NO]; if (_enableGraphs) {
[self.mtkView setHidden:NO];
}
} }
-(void)hide { -(void)hide {
[self.mtkView setHidden:YES]; if (_enableGraphs) {
[self.mtkView setHidden:YES];
}
// When graphs are disabled, ImGui stays hidden but keeps running for display sync
} }
-(void)stop { -(void)stop {
@@ -120,14 +133,6 @@
// Only called when mtkView.paused is false // Only called when mtkView.paused is false
- (void)drawInMTKView:(MTKView *)view - (void)drawInMTKView:(MTKView *)view
{ {
#if !defined(IMGUI_DISABLE)
ImGuiIO &io = ImGui::GetIO();
io.DisplaySize.x = view.bounds.size.width;
io.DisplaySize.y = view.bounds.size.height;
CGFloat framebufferScale = view.window.screen.scale ?: UIScreen.mainScreen.scale;
io.DisplayFramebufferScale = ImVec2(framebufferScale, framebufferScale);
id<MTLCommandBuffer> commandBuffer = [self.commandQueue commandBuffer]; id<MTLCommandBuffer> commandBuffer = [self.commandQueue commandBuffer];
MTLRenderPassDescriptor* renderPassDescriptor = view.currentRenderPassDescriptor; MTLRenderPassDescriptor* renderPassDescriptor = view.currentRenderPassDescriptor;
@@ -136,40 +141,59 @@
return; return;
} }
// Start the Dear ImGui frame if (_enableGraphs) {
ImGui_ImplMetal_NewFrame(renderPassDescriptor); #if !defined(IMGUI_DISABLE)
ImGui::NewFrame(); ImGuiIO &io = ImGui::GetIO();
io.DisplaySize.x = view.bounds.size.width;
io.DisplaySize.y = view.bounds.size.height;
// 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!). CGFloat framebufferScale = view.window.screen.scale ?: UIScreen.mainScreen.scale;
static bool show_demo_window = false; io.DisplayFramebufferScale = ImVec2(framebufferScale, framebufferScale);
if (show_demo_window)
ImGui::ShowDemoWindow(&show_demo_window);
// Custom Moonlight stuff goes here // Start the Dear ImGui frame
[self drawStatsGraphs]; ImGui_ImplMetal_NewFrame(renderPassDescriptor);
ImGui::NewFrame();
// Rendering // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
ImGui::Render(); static bool show_demo_window = false;
ImDrawData* draw_data = ImGui::GetDrawData(); if (show_demo_window)
ImGui::ShowDemoWindow(&show_demo_window);
// This looks silly when clear_color is all zeros but the original example uses this method to tint or make transparent the rest of the viewport // Custom Moonlight stuff goes here
static ImVec4 clear_color = ImVec4(0, 0, 0, 0); [self drawStatsGraphs];
renderPassDescriptor.colorAttachments[0].clearColor = MTLClearColorMake(clear_color.x * clear_color.w, clear_color.y * clear_color.w, clear_color.z * clear_color.w, clear_color.w);
id <MTLRenderCommandEncoder> renderEncoder = [commandBuffer renderCommandEncoderWithDescriptor:renderPassDescriptor]; // Rendering
[renderEncoder pushDebugGroup:@"Dear ImGui rendering"]; ImGui::Render();
ImGui_ImplMetal_RenderDrawData(draw_data, commandBuffer, renderEncoder); ImDrawData* draw_data = ImGui::GetDrawData();
[renderEncoder popDebugGroup];
[renderEncoder endEncoding];
// Present // This looks silly when clear_color is all zeros but the original example uses this method to tint or make transparent the rest of the viewport
static ImVec4 clear_color = ImVec4(0, 0, 0, 0);
renderPassDescriptor.colorAttachments[0].clearColor = MTLClearColorMake(clear_color.x * clear_color.w, clear_color.y * clear_color.w, clear_color.z * clear_color.w, clear_color.w);
id <MTLRenderCommandEncoder> renderEncoder = [commandBuffer renderCommandEncoderWithDescriptor:renderPassDescriptor];
[renderEncoder pushDebugGroup:@"Dear ImGui rendering"];
ImGui_ImplMetal_RenderDrawData(draw_data, commandBuffer, renderEncoder);
[renderEncoder popDebugGroup];
[renderEncoder endEncoding];
#endif
} else {
// When graphs are disabled, just render a transparent frame for display sync
renderPassDescriptor.colorAttachments[0].clearColor = MTLClearColorMake(0.0, 0.0, 0.0, 0.0);
id <MTLRenderCommandEncoder> renderEncoder = [commandBuffer renderCommandEncoderWithDescriptor:renderPassDescriptor];
[renderEncoder pushDebugGroup:@"Display sync frame"];
// Don't render anything, just clear
[renderEncoder popDebugGroup];
[renderEncoder endEncoding];
}
// Present (always with timing for display sync)
#if TARGET_OS_SIMULATOR #if TARGET_OS_SIMULATOR
[commandBuffer presentDrawable:view.currentDrawable]; [commandBuffer presentDrawable:view.currentDrawable];
#else #else
[commandBuffer presentDrawable:view.currentDrawable afterMinimumDuration:1.0 / view.preferredFramesPerSecond]; [commandBuffer presentDrawable:view.currentDrawable afterMinimumDuration:1.0 / view.preferredFramesPerSecond];
#endif #endif
[commandBuffer commit]; [commandBuffer commit];
#endif
} }
- (void)mtkView:(MTKView *)view drawableSizeWillChange:(CGSize)size - (void)mtkView:(MTKView *)view drawableSizeWillChange:(CGSize)size