git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-08 05:33:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

wasm: Handle WebGPU part for integration

Browse source 
Updated the WebGPU engine API to align with the latest interface.

Static/Single instance, adapter and device to support multiple canvases on the browser.

Moved the WGPU request part to `initWGInstance` helper function. This must only be called once even, when multiple players are involved.

Issue: #2695
This commit is contained in:
Jinny You 2024-09-23 16:20:52 +09:00 • committed by Hermet Park
parent 7e4a568ec2
commit 7ec697aa77
1 changed files with 46 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/bindings/wasm/tvgWasmLottieAnimation.cpp
View file

@ -21,6 +21,7 @@
*/
#include <thorvg.h>
#include <emscripten.h>
#include <emscripten/bind.h>
#include "tvgPicture.h"
#ifdef THORVG_WG_RASTER_SUPPORT
@ -33,6 +34,47 @@ using namespace tvg;
static const char* NoError = "None";
#ifdef THORVG_WG_RASTER_SUPPORT
static WGPUInstance instance{};
static WGPUAdapter adapter{};
static WGPUDevice device{};
#endif
void init()
{
#ifdef THORVG_WG_RASTER_SUPPORT
//Init WebGPU
if (!instance) instance = wgpuCreateInstance(nullptr);
// request adapter
if (!adapter) {
const WGPURequestAdapterOptions requestAdapterOptions { .nextInChain = nullptr, .powerPreference = WGPUPowerPreference_HighPerformance, .forceFallbackAdapter = false };
auto onAdapterRequestEnded = [](WGPURequestAdapterStatus status, WGPUAdapter adapter, char const * message, void * pUserData) { *((WGPUAdapter*)pUserData) = adapter; };
wgpuInstanceRequestAdapter(instance, &requestAdapterOptions, onAdapterRequestEnded, &adapter);
while (!adapter) emscripten_sleep(10);
}
// request device
WGPUFeatureName featureNames[32]{};
size_t featuresCount = wgpuAdapterEnumerateFeatures(adapter, featureNames);
if (!device) {
const WGPUDeviceDescriptor deviceDesc { .nextInChain = nullptr, .label = "The device", .requiredFeatureCount = featuresCount, .requiredFeatures = featureNames };
auto onDeviceRequestEnded = [](WGPURequestDeviceStatus status, WGPUDevice device, char const * message, void * pUserData) { *((WGPUDevice*)pUserData) = device; };
wgpuAdapterRequestDevice(adapter, &deviceDesc, onDeviceRequestEnded, &device);
while (!device) emscripten_sleep(10);
}
#endif
}
void term()
{
#ifdef THORVG_WG_RASTER_SUPPORT
wgpuDeviceRelease(device);
wgpuAdapterRelease(adapter);
wgpuInstanceRelease(instance);
#endif
}
struct TvgEngineMethod
{
virtual ~TvgEngineMethod() {}
@ -77,7 +119,6 @@ struct TvgSwEngine : TvgEngineMethod
struct TvgWgEngine : TvgEngineMethod
{
#ifdef THORVG_WG_RASTER_SUPPORT
WGPUInstance instance{};
WGPUSurface surface{};
#endif
@ -85,7 +126,6 @@ struct TvgWgEngine : TvgEngineMethod
{
#ifdef THORVG_WG_RASTER_SUPPORT
wgpuSurfaceRelease(surface);
wgpuInstanceRelease(instance);
#endif
Initializer::term(tvg::CanvasEngine::Wg);
}
@ -93,9 +133,6 @@ struct TvgWgEngine : TvgEngineMethod
unique_ptr<Canvas> init(string& selector) override
{
#ifdef THORVG_WG_RASTER_SUPPORT
//Init WebGPU
instance = wgpuCreateInstance(nullptr);
WGPUSurfaceDescriptorFromCanvasHTMLSelector canvasDesc{};
canvasDesc.chain.next = nullptr;
canvasDesc.chain.sType = WGPUSType_SurfaceDescriptorFromCanvasHTMLSelector;
@ -112,7 +149,7 @@ struct TvgWgEngine : TvgEngineMethod
void resize(Canvas* canvas, int w, int h) override
{
static_cast<WgCanvas*>(canvas)->target(instance, surface, w, h);
static_cast<WgCanvas*>(canvas)->target(instance, surface, w, h, device);
}
};
@ -425,6 +462,9 @@ private:
EMSCRIPTEN_BINDINGS(thorvg_bindings)
{
emscripten::function("init", &init);
emscripten::function("term", &term);
class_<TvgLottieAnimation>("TvgLottieAnimation")
.constructor<string, string>()
.function("error", &TvgLottieAnimation ::error, allow_raw_pointers())