From 43819fcd1646e2c3841335c3a3707551b0a84a7b Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sat, 29 Jan 2022 22:36:08 -0800
Subject: [PATCH 1/2] UI: Cleanup some reference warnings.

---
 UI/GameScreen.cpp         | 4 ++++
 UI/GameSettingsScreen.cpp | 2 +-
 unittest/UnitTest.cpp     | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp
index bc3ca9ee5b..825bb6738f 100644
--- a/UI/GameScreen.cpp
+++ b/UI/GameScreen.cpp
@@ -187,6 +187,10 @@ void GameScreen::CreateViews() {
 		case IdentifiedFileType::PSP_ISO_NP:
 		case IdentifiedFileType::PSP_ISO:
 			fileTypeSupportCRC = true;
+			break;
+
+		default:
+			break;
 		}
 	}
 
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 739208876a..180f79eaa1 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -1680,7 +1680,7 @@ UI::EventReturn GameSettingsScreen::OnSysInfo(UI::EventParams &e) {
 UI::EventReturn GameSettingsScreen::OnChangeSearchFilter(UI::EventParams &e) {
 #if PPSSPP_PLATFORM(WINDOWS) || defined(USING_QT_UI) || defined(__ANDROID__)
 	auto se = GetI18NCategory("Search");
-	System_InputBoxGetString(se->T("Search term"), searchFilter_, [this](bool result, const std::string &value) {
+	System_InputBoxGetString(se->T("Search term"), searchFilter_, [](bool result, const std::string &value) {
 		if (result) {
 			NativeMessageReceived("gameSettings_search", StripSpaces(value).c_str());
 		}
diff --git a/unittest/UnitTest.cpp b/unittest/UnitTest.cpp
index 7dc06d7e7d..cc85af7e7a 100644
--- a/unittest/UnitTest.cpp
+++ b/unittest/UnitTest.cpp
@@ -311,7 +311,6 @@ bool TestParsers() {
 bool TestVFPUSinCos() {
 	float sine, cosine;
 	InitVFPUSinCos();
-	EXPECT_FALSE(vfpu_sincos == nullptr);
 	vfpu_sincos(0.0f, sine, cosine);
 	EXPECT_EQ_FLOAT(sine, 0.0f);
 	EXPECT_EQ_FLOAT(cosine, 1.0f);

From cb0bc8543b64694dadac08939fd5f72e127d163c Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sat, 29 Jan 2022 22:36:21 -0800
Subject: [PATCH 2/2] Build: Ignore nullable completeness on Android.

Gives a bunch of warning spam with Vulkan Memory Allocator.
---
 android/jni/Locals.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk
index 552d4f1f96..61a725dce3 100644
--- a/android/jni/Locals.mk
+++ b/android/jni/Locals.mk
@@ -4,7 +4,7 @@
 LOCAL_CFLAGS := -DUSE_FFMPEG -DWITH_UPNP -DUSING_GLES2 -DMOBILE_DEVICE -O3 -fsigned-char -Wall -Wno-multichar -Wno-unused-variable -fno-strict-aliasing -D__STDC_CONSTANT_MACROS -Wno-format -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
 # yes, it's really CPPFLAGS for C++
 # deprecated-register is generated by Android default code and causes noise.
-LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder -Wno-format -Wno-deprecated-register
+LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder -Wno-format -Wno-deprecated-register -Wno-nullability-completeness
 LOCAL_C_INCLUDES := \
   $(LOCAL_PATH)/../../Common \
   $(LOCAL_PATH)/../.. \