fix(tests): Run android test apps in landscape on TVs (#13103) e94936fac8 Co-authored-by: Chris Dalton <99840794+csmartdalton@users.noreply.github.com>
diff --git a/.rive_head b/.rive_head index ec53e13..7bd4a76 100644 --- a/.rive_head +++ b/.rive_head
@@ -1 +1 @@ -90140f105b84682dd5e6021cace4e64b95250e14 +e94936fac8f750b763db4255ac2e5a3787f43ac2
diff --git a/renderer/rive_vk_bootstrap/src/vulkan_debug_callbacks.cpp b/renderer/rive_vk_bootstrap/src/vulkan_debug_callbacks.cpp index f53008c..6839307 100644 --- a/renderer/rive_vk_bootstrap/src/vulkan_debug_callbacks.cpp +++ b/renderer/rive_vk_bootstrap/src/vulkan_debug_callbacks.cpp
@@ -31,6 +31,15 @@ " (format maxArrayLayers: 0)", "maximum resource size = 0 for format ", "(format sampleCounts: VkSampleCountFlags(0))", + // Some PowerVR drivers (e.g. Rogue GE9215) don't support descriptor + // indexing, so the update-after-bind input attachment limits are + // reported as 0. The layer then flags our rasterOrdering PLS input + // attachments against those limits (both the per-stage VUID-03027 and + // the whole-set VUID-03043) even though none of our set layouts use + // UPDATE_AFTER_BIND, which is what those VUIDs are gated on. This is + // spurious. The real (non-update-after-bind) limits are satisfied. The + // shared substring matches both messages. + "UpdateAfterBindInputAttachments limit (0)", }; for (const char* ignore : s_ignoreList) @@ -85,41 +94,43 @@ void* pUserData) { bool shouldAbort = true; - if (should_error_message_be_fully_ignored(pCallbackData->pMessage)) + if (!should_error_message_be_fully_ignored(pCallbackData->pMessage)) { - return VK_TRUE; - } + switch (messageType) + { + case VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT: + shouldAbort = + should_error_message_abort(pCallbackData->pMessage); + LOG_ERROR_LINE("Rive Vulkan error%s: %i: %s: %s\n", + (shouldAbort) ? "" : " (error ignored)", + pCallbackData->messageIdNumber, + pCallbackData->pMessageIdName, + pCallbackData->pMessage); - switch (messageType) - { - case VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT: - shouldAbort = should_error_message_abort(pCallbackData->pMessage); - LOG_ERROR_LINE("Rive Vulkan error%s: %i: %s: %s\n", - (shouldAbort) ? "" : " (error ignored)", - pCallbackData->messageIdNumber, - pCallbackData->pMessageIdName, - pCallbackData->pMessage); + if (shouldAbort) + { + abort(); + } + break; - if (shouldAbort) - { + case VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT: + LOG_ERROR_LINE("Rive Vulkan Validation error: %i: %s: %s", + pCallbackData->messageIdNumber, + pCallbackData->pMessageIdName, + pCallbackData->pMessage); abort(); - } - break; - - case VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT: - LOG_ERROR_LINE("Rive Vulkan Validation error: %i: %s: %s", - pCallbackData->messageIdNumber, - pCallbackData->pMessageIdName, - pCallbackData->pMessage); - abort(); - case VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT: - LOG_ERROR_LINE("Rive Vulkan Performance warning: %i: %s: %s", - pCallbackData->messageIdNumber, - pCallbackData->pMessageIdName, - pCallbackData->pMessage); - break; + case VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT: + LOG_ERROR_LINE("Rive Vulkan Performance warning: %i: %s: %s", + pCallbackData->messageIdNumber, + pCallbackData->pMessageIdName, + pCallbackData->pMessage); + break; + } } - return VK_TRUE; + // VK_FALSE: never ask the layer to fail the triggering call. Paths that + // reach here are non-aborting (ignored errors, perf warnings); returning + // VK_TRUE would make those calls return VK_ERROR_VALIDATION_FAILED_EXT. + return VK_FALSE; } VKAPI_ATTR VkBool32 VKAPI_CALL
diff --git a/tests/android_tests/app/src/main/AndroidManifest.xml b/tests/android_tests/app/src/main/AndroidManifest.xml index 2e8f98a..161c463 100644 --- a/tests/android_tests/app/src/main/AndroidManifest.xml +++ b/tests/android_tests/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@ tools:targetApi="31"> <activity android:name=".gms" android:label="android_tests_gms" - android:configChanges="orientation|keyboardHidden" + android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboardHidden" android:screenOrientation="portrait" android:exported="true"> <!-- Tell NativeActivity the name of our .so --> @@ -27,7 +27,7 @@ </activity> <activity android:name=".goldens" android:label="android_tests_goldens" - android:configChanges="orientation|keyboardHidden" + android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboardHidden" android:screenOrientation="portrait" android:exported="true"> <!-- Tell NativeActivity the name of our .so --> @@ -40,7 +40,7 @@ </activity> <activity android:name=".player" android:label="android_tests_player" - android:configChanges="orientation|keyboardHidden" + android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboardHidden" android:screenOrientation="portrait" android:exported="true"> <!-- Tell NativeActivity the name of our .so -->
diff --git a/tests/android_tests/app/src/main/java/app/rive/android_tools/RiveNativeActivity.kt b/tests/android_tests/app/src/main/java/app/rive/android_tools/RiveNativeActivity.kt new file mode 100644 index 0000000..ff0cfc0 --- /dev/null +++ b/tests/android_tests/app/src/main/java/app/rive/android_tools/RiveNativeActivity.kt
@@ -0,0 +1,24 @@ +package app.rive.android_tests + +import android.app.NativeActivity +import android.app.UiModeManager +import android.content.Context +import android.content.pm.ActivityInfo +import android.content.res.Configuration +import android.os.Bundle + +// Base class for the android test activities. +open class RiveNativeActivity : NativeActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + val uiModeManager = + getSystemService(Context.UI_MODE_SERVICE) as UiModeManager + if (uiModeManager.currentModeType == + Configuration.UI_MODE_TYPE_TELEVISION) { + // TVs are fixed landscape panels, so our default portrait + // orientation gets letterboxed into a vertical strip. This + // overrides to landscape on TVs and leaves phones in portrait. + requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE + } + } +}
diff --git a/tests/android_tests/app/src/main/java/app/rive/android_tools/gms.kt b/tests/android_tests/app/src/main/java/app/rive/android_tools/gms.kt index 4d6ac55..6d37498 100644 --- a/tests/android_tests/app/src/main/java/app/rive/android_tools/gms.kt +++ b/tests/android_tests/app/src/main/java/app/rive/android_tools/gms.kt
@@ -1,5 +1,3 @@ package app.rive.android_tests -import android.app.NativeActivity - -class gms : NativeActivity() {} \ No newline at end of file +class gms : RiveNativeActivity() {}
diff --git a/tests/android_tests/app/src/main/java/app/rive/android_tools/goldens.kt b/tests/android_tests/app/src/main/java/app/rive/android_tools/goldens.kt index bfc38f5..d972f93 100644 --- a/tests/android_tests/app/src/main/java/app/rive/android_tools/goldens.kt +++ b/tests/android_tests/app/src/main/java/app/rive/android_tools/goldens.kt
@@ -1,5 +1,3 @@ package app.rive.android_tests -import android.app.NativeActivity - -class goldens : NativeActivity() {} \ No newline at end of file +class goldens : RiveNativeActivity() {}
diff --git a/tests/android_tests/app/src/main/java/app/rive/android_tools/player.kt b/tests/android_tests/app/src/main/java/app/rive/android_tools/player.kt index 498a0ed..2eef447 100644 --- a/tests/android_tests/app/src/main/java/app/rive/android_tools/player.kt +++ b/tests/android_tests/app/src/main/java/app/rive/android_tools/player.kt
@@ -1,5 +1,3 @@ package app.rive.android_tests -import android.app.NativeActivity - -class player : NativeActivity() {} \ No newline at end of file +class player : RiveNativeActivity() {}
diff --git a/tests/common/rive_android_app.cpp b/tests/common/rive_android_app.cpp index 5bf8319..69b2182 100644 --- a/tests/common/rive_android_app.cpp +++ b/tests/common/rive_android_app.cpp
@@ -9,6 +9,11 @@ static android_app* _app; static bool _windowInitialized = false; +// Dimensions the window was at when we initialized it (and therefore built the +// swapchain from). Used to distinguish a genuine live resize from the redundant +// same-size APP_CMD_WINDOW_RESIZED that Android emits during startup. +static int32_t _initialWindowWidth = 0; +static int32_t _initialWindowHeight = 0; // Parses CLI arguments from the NativeActivity's launch intent and then calls // rive_android_main(). @@ -22,6 +27,29 @@ if (cmd == APP_CMD_INIT_WINDOW) { _windowInitialized = true; + _initialWindowWidth = ANativeWindow_getWidth(_app->window); + _initialWindowHeight = ANativeWindow_getHeight(_app->window); + } + else if (cmd == APP_CMD_WINDOW_RESIZED && _windowInitialized) + { + // We build the swapchain once from the initial window size and + // never recreate it, so a live resize isn't handled: the render + // surface would be stale (or the swapchain would go out-of-date). + // Android emits a redundant same-size resize during startup, so + // only warn when the dimensions actually changed. + int32_t width = ANativeWindow_getWidth(_app->window); + int32_t height = ANativeWindow_getHeight(_app->window); + if (width != _initialWindowWidth || height != _initialWindowHeight) + { + fprintf(stderr, + "WARNING: window resized from %dx%d to %dx%d after " + "startup; the swapchain is not recreated, so rendering " + "may be wrong-sized or fail.\n", + _initialWindowWidth, + _initialWindowHeight, + width, + height); + } } };