[android] Modified compiliance of Android's Surface in older API's

This commit is contained in:
CamilleLaVey
2026-03-08 12:31:49 -04:00
parent 842acf2c86
commit 2e89bb890a
2 changed files with 29 additions and 8 deletions
@@ -9,6 +9,10 @@
#include <limits>
#include <vector>
#ifdef __ANDROID__
#include <android/api-level.h>
#endif
#include "common/logging/log.h"
#include "common/settings.h"
#include "common/settings_enums.h"
@@ -170,9 +174,7 @@ bool Swapchain::AcquireNextImage() {
break;
}
#ifdef __ANDROID__
scheduler.Wait(resource_ticks[image_index]);
#else
const auto wait_with_frame_pacing = [this, image_index] {
switch (Settings::values.frame_pacing_mode.GetValue()) {
case Settings::FramePacingMode::Target_Auto:
scheduler.Wait(resource_ticks[image_index]);
@@ -190,6 +192,16 @@ bool Swapchain::AcquireNextImage() {
scheduler.Wait(resource_ticks[image_index], 120.0);
break;
}
};
#ifdef __ANDROID__
if (android_get_device_api_level() >= 30) {
scheduler.Wait(resource_ticks[image_index]);
} else {
wait_with_frame_pacing();
}
#else
wait_with_frame_pacing();
#endif
resource_ticks[image_index] = scheduler.CurrentTick();