Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-10-23 07:35:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Fix logo not displaying during loading

Browse source
This commit is contained in:
Connor McLaughlin 2020-10-07 17:58:11 +10:00
parent de33c7fa2b
commit 533722456b
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
android/app/src/cpp/android_host_interface.cpp
View file

@ -366,16 +366,26 @@ bool AndroidHostInterface::AcquireHostDisplay()
!display->InitializeRenderDevice(GetShaderCacheBasePath(), g_settings.gpu_use_debug_device)) !display->InitializeRenderDevice(GetShaderCacheBasePath(), g_settings.gpu_use_debug_device))
{ {
ReportError("Failed to acquire host display."); ReportError("Failed to acquire host display.");
display->DestroyRenderDevice();
return false; return false;
} }
m_display = std::move(display); m_display = std::move(display);
if (!CreateHostDisplayResources())
{
ReportError("Failed to create host display resources");
ReleaseHostDisplay();
return false;
}
ImGui::NewFrame(); ImGui::NewFrame();
return true; return true;
} }
void AndroidHostInterface::ReleaseHostDisplay() void AndroidHostInterface::ReleaseHostDisplay()
{ {
ReleaseHostDisplayResources();
m_display->DestroyRenderDevice(); m_display->DestroyRenderDevice();
m_display.reset(); m_display.reset();
} }
@ -830,3 +840,9 @@ DEFINE_JNI_ARGS_METHOD(void, AndroidHostInterface_setCheatEnabled, jobject obj,
AndroidHostInterface* hi = AndroidHelpers::GetNativeClass(env, obj); AndroidHostInterface* hi = AndroidHelpers::GetNativeClass(env, obj);
hi->RunOnEmulationThread([index, enabled, hi]() { hi->SetCheatCodeState(static_cast<u32>(index), enabled, true); }); hi->RunOnEmulationThread([index, enabled, hi]() { hi->SetCheatCodeState(static_cast<u32>(index), enabled, true); });
} }
DEFINE_JNI_ARGS_METHOD(void, AndroidHostInterface_addOSDMessage, jobject obj, jstring message, jfloat duration)
{
AndroidHostInterface* hi = AndroidHelpers::GetNativeClass(env, obj);
hi->AddOSDMessage(AndroidHelpers::JStringToString(env, message), duration);
}

2
android/app/src/main/java/com/github/stenzek/duckstation/AndroidHostInterface.java
View file

@ -74,6 +74,8 @@ public class AndroidHostInterface {
public native CheatCode[] getCheatList(); public native CheatCode[] getCheatList();
public native void setCheatEnabled(int index, boolean enabled); public native void setCheatEnabled(int index, boolean enabled);
public native void addOSDMessage(String message, float duration);
static { static {
System.loadLibrary("duckstation-native"); System.loadLibrary("duckstation-native");
} }

2
android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
View file

@ -372,7 +372,7 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde
private void showCheatsMenu() { private void showCheatsMenu() {
final CheatCode[] cheats = AndroidHostInterface.getInstance().getCheatList(); final CheatCode[] cheats = AndroidHostInterface.getInstance().getCheatList();
if (cheats == null) { if (cheats == null) {
Toast.makeText(this, "No cheats are loaded.", Toast.LENGTH_LONG); AndroidHostInterface.getInstance().addOSDMessage("No cheats are loaded.", 5.0f);
return; return;
} }