From fb4c788ab5cc0b88aafce510ed016f3e1017eb01 Mon Sep 17 00:00:00 2001 From: csmartdalton Date: Thu, 29 Aug 2024 01:32:53 +0000 Subject: [PATCH] Support Vulkan on Android Since atmoic support isn't guaranteed on Vulkan, add a new PlatformFeature called 'supportsFragmentShaderAtomics'. Various bugfixes. Download and package Vulkan validation layers with the android testing apk. Start an android Vulkan runner that doesn't do diffing yet. Diffs= cc903ee02 Support Vulkan on Android (#7915) Co-authored-by: Chris Dalton <99840794+csmartdalton@users.noreply.github.com> --- .rive_head | 2 +- wasm/src/bindings_webgl2.cpp | 3 ++- wasm/submodules/rive-runtime | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.rive_head b/.rive_head index cb604e1..5f7b8b1 100644 --- a/.rive_head +++ b/.rive_head @@ -1 +1 @@ -c7bb5eb5ae34e300171bc6e48e26216170b094c7 +cc903ee0236a43b850488e029f270e5da23625b7 diff --git a/wasm/src/bindings_webgl2.cpp b/wasm/src/bindings_webgl2.cpp index 43bd754..6b425a5 100644 --- a/wasm/src/bindings_webgl2.cpp +++ b/wasm/src/bindings_webgl2.cpp @@ -277,7 +277,8 @@ class WebGL2Renderer : public RiveRenderer // Use MSAA if we were given a canvas with 'antialias: true'. frameDescriptor.msaaSampleCount = m_renderTarget->sampleCount(); } - else if (!m_plsContext->platformFeatures().supportsPixelLocalStorage) + else if (!m_plsContext->platformFeatures().supportsRasterOrdering && + !m_plsContext->platformFeatures().supportsFragmentShaderAtomics) { // Always use MSAA if we don't have WEBGL_shader_pixel_local_storage. frameDescriptor.msaaSampleCount = 4; diff --git a/wasm/submodules/rive-runtime b/wasm/submodules/rive-runtime index 0d2d40c..26d42ff 160000 --- a/wasm/submodules/rive-runtime +++ b/wasm/submodules/rive-runtime @@ -1 +1 @@ -Subproject commit 0d2d40ca8e0f6efe1f68f930ed6cfaab66a37439 +Subproject commit 26d42ff6e143042aad5fca6bf109c0b7c0616ba9