emu-mirror/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2025-03-25 06:58:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

OpenGL is working on surface change, vulkan still no

Browse Source
This commit is contained in:
David Griswold 2025-03-05 08:10:50 -03:00 committed by OpenSauce04
parent dc885ca674
commit 37f73070a9
4 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/android/app/src/main/jni/native.cpp
View File

@ -317,7 +317,7 @@ void Java_org_citra_citra_1emu_NativeLibrary_surfaceChanged(JNIEnv* env,
auto& system = Core::System::GetInstance(); auto& system = Core::System::GetInstance();
if (notify && system.IsPoweredOn()) { if (notify && system.IsPoweredOn()) {
system.GPU().Renderer().NotifySurfaceChanged(); system.GPU().Renderer().NotifySurfaceChanged(false);
} }
LOG_INFO(Frontend, "Surface changed"); LOG_INFO(Frontend, "Surface changed");
@ -325,16 +325,16 @@ void Java_org_citra_citra_1emu_NativeLibrary_surfaceChanged(JNIEnv* env,
void Java_org_citra_citra_1emu_NativeLibrary_enableSecondWindow(JNIEnv* env, void Java_org_citra_citra_1emu_NativeLibrary_enableSecondWindow(JNIEnv* env,
[[maybe_unused]] jobject obj,jobject surf) { [[maybe_unused]] jobject obj,jobject surf) {
s_secondary_surface = ANativeWindow_fromSurface(env, surf); s_secondary_surface = ANativeWindow_fromSurface(env, surf);
secondary_enabled = true; secondary_enabled = true;
bool notify = false; bool notify = false;
if (second_window) { if (second_window) {
notify = second_window->OnSurfaceChanged(s_secondary_surface); notify = second_window->OnSurfaceChanged(s_secondary_surface);
} }
auto& system = Core::System::GetInstance(); auto& system = Core::System::GetInstance();
if (notify && system.IsPoweredOn()) { if (notify && system.IsPoweredOn()) {
system.GPU().Renderer().NotifySurfaceChanged(); system.GPU().Renderer().NotifySurfaceChanged(true);
} }
LOG_INFO(Frontend, "Secondary Surface changed"); LOG_INFO(Frontend, "Secondary Surface changed");
} }
@ -345,7 +345,13 @@ void Java_org_citra_citra_1emu_NativeLibrary_disableSecondWindow(JNIEnv* env,
[[maybe_unused]] jobject obj) { [[maybe_unused]] jobject obj) {
secondary_enabled = false; secondary_enabled = false;
// how do I delete the window? TODO if (s_secondary_surface != nullptr) {
ANativeWindow_release(s_secondary_surface);
s_secondary_surface = nullptr;
if (second_window) {
second_window->OnSurfaceChanged(s_secondary_surface);
}
}
LOG_INFO(Frontend, "Secondary Surface Disabled"); LOG_INFO(Frontend, "Secondary Surface Disabled");
} }

3
src/video_core/renderer_base.h
View File

@ -64,7 +64,8 @@ public:
virtual void Sync() {} virtual void Sync() {}
/// This is called to notify the rendering backend of a surface change /// This is called to notify the rendering backend of a surface change
virtual void NotifySurfaceChanged() {} // if second == true then it is the second screen
virtual void NotifySurfaceChanged(bool second) {}
/// Returns the resolution scale factor relative to the native 3DS screen resolution /// Returns the resolution scale factor relative to the native 3DS screen resolution
u32 GetResolutionScaleFactor(); u32 GetResolutionScaleFactor();

6
src/video_core/renderer_vulkan/renderer_vulkan.cpp
View File

@ -1129,4 +1129,10 @@ bool RendererVulkan::TryRenderScreenshotWithHostMemory() {
return true; return true;
} }
void RendererVulkan::NotifySurfaceChanged(bool second) {
if (second && second_window) second_window->NotifySurfaceChanged();
if (!second) main_window.NotifySurfaceChanged();
}
} // namespace Vulkan } // namespace Vulkan

5
src/video_core/renderer_vulkan/renderer_vulkan.h
View File

@ -74,10 +74,7 @@ public:
return &rasterizer; return &rasterizer;
} }
void NotifySurfaceChanged() override { void NotifySurfaceChanged(bool second) override;
main_window.NotifySurfaceChanged();
if (second_window) second_window->NotifySurfaceChanged();
}
void SwapBuffers() override; void SwapBuffers() override;
void TryPresent(int timeout_ms, bool is_secondary) override {} void TryPresent(int timeout_ms, bool is_secondary) override {}