maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't pass View to readPixels (only width/height, x/y offsets needed, and optionally rendertarget)

Browse Source
This commit is contained in:
Nick Fisher
2025-07-01 13:01:39 +08:00
parent 0693a2a95b
commit e984d8cf71
5 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
thermion_dart/lib/src/filament/src/implementation/ffi_filament_app.dart
View File

@@ -800,10 +800,11 @@ class FFIFilamentApp extends FilamentApp<Pointer> {
if (captureRenderTarget && view.renderTarget == null) { if (captureRenderTarget && view.renderTarget == null) {
throw Exception(); throw Exception();
} }
await withVoidCallback((requestId, cb) { await withVoidCallback((requestId, cb) {
Renderer_readPixelsRenderThread( Renderer_readPixelsRenderThread(
renderer, renderer,
view.view, viewport.width, viewport.height, 0, 0,
view.renderTarget == null view.renderTarget == null
? nullptr ? nullptr
: view.renderTarget!.getNativeHandle(), : view.renderTarget!.getNativeHandle(),

2
thermion_dart/native/include/c_api/TRenderer.h
View File

@@ -17,7 +17,7 @@ EMSCRIPTEN_KEEPALIVE void Renderer_render(TRenderer *tRenderer, TView *tView);
EMSCRIPTEN_KEEPALIVE void Renderer_renderStandaloneView(TRenderer *tRenderer, TView *tView); EMSCRIPTEN_KEEPALIVE void Renderer_renderStandaloneView(TRenderer *tRenderer, TView *tView);
EMSCRIPTEN_KEEPALIVE void Renderer_readPixels( EMSCRIPTEN_KEEPALIVE void Renderer_readPixels(
TRenderer *tRenderer, TRenderer *tRenderer,
TView *tView, uint32_t width, uint32_t height, uint32_t xOffset, uint32_t yOffset,
TRenderTarget *tRenderTarget, TRenderTarget *tRenderTarget,
TPixelDataFormat tPixelBufferFormat, TPixelDataFormat tPixelBufferFormat,
TPixelDataType tPixelDataType, TPixelDataType tPixelDataType,

2
thermion_dart/native/include/c_api/ThermionDartRenderThreadApi.h
View File

@@ -79,7 +79,7 @@ namespace thermion
void Renderer_renderStandaloneViewRenderThread(TRenderer *tRenderer, TView *tView, uint32_t requestId, VoidCallback onComplete); void Renderer_renderStandaloneViewRenderThread(TRenderer *tRenderer, TView *tView, uint32_t requestId, VoidCallback onComplete);
void Renderer_readPixelsRenderThread( void Renderer_readPixelsRenderThread(
TRenderer *tRenderer, TRenderer *tRenderer,
TView *tView, uint32_t width, uint32_t height, uint32_t xOffset, uint32_t yOffset,
TRenderTarget *tRenderTarget, TRenderTarget *tRenderTarget,
TPixelDataFormat tPixelBufferFormat, TPixelDataFormat tPixelBufferFormat,
TPixelDataType tPixelDataType, TPixelDataType tPixelDataType,

9
thermion_dart/native/src/c_api/TRenderer.cpp
View File

@@ -93,7 +93,7 @@ class CaptureCallbackHandler : public filament::backend::CallbackHandler
EMSCRIPTEN_KEEPALIVE void Renderer_readPixels( EMSCRIPTEN_KEEPALIVE void Renderer_readPixels(
TRenderer *tRenderer, TRenderer *tRenderer,
TView *tView, uint32_t width, uint32_t height, uint32_t xOffset, uint32_t yOffset,
TRenderTarget *tRenderTarget, TRenderTarget *tRenderTarget,
TPixelDataFormat tPixelBufferFormat, TPixelDataFormat tPixelBufferFormat,
TPixelDataType tPixelDataType, TPixelDataType tPixelDataType,
@@ -102,9 +102,6 @@ EMSCRIPTEN_KEEPALIVE void Renderer_readPixels(
auto *renderer = reinterpret_cast<filament::Renderer *>(tRenderer); auto *renderer = reinterpret_cast<filament::Renderer *>(tRenderer);
auto *renderTarget = reinterpret_cast<filament::RenderTarget *>(tRenderTarget); auto *renderTarget = reinterpret_cast<filament::RenderTarget *>(tRenderTarget);
auto *view = reinterpret_cast<filament::View *>(tView);
filament::Viewport const &vp = view->getViewport();
filament::backend::PixelDataFormat pixelBufferFormat = static_cast<filament::backend::PixelDataFormat>(tPixelBufferFormat); filament::backend::PixelDataFormat pixelBufferFormat = static_cast<filament::backend::PixelDataFormat>(tPixelBufferFormat);
filament::backend::PixelDataType pixelDataType = static_cast<filament::backend::PixelDataType>(tPixelDataType); filament::backend::PixelDataType pixelDataType = static_cast<filament::backend::PixelDataType>(tPixelDataType);
@@ -126,9 +123,9 @@ EMSCRIPTEN_KEEPALIVE void Renderer_readPixels(
); );
if(renderTarget) { if(renderTarget) {
renderer->readPixels(renderTarget, 0, 0, vp.width, vp.height, std::move(pbd)); renderer->readPixels(renderTarget, xOffset, yOffset, width, height, std::move(pbd));
} else { } else {
renderer->readPixels(0, 0, vp.width, vp.height, std::move(pbd)); renderer->readPixels(xOffset, yOffset, width, height, std::move(pbd));
} }
} }

4
thermion_dart/native/src/c_api/ThermionDartRenderThreadApi.cpp
View File

@@ -474,7 +474,7 @@ extern "C"
EMSCRIPTEN_KEEPALIVE void Renderer_readPixelsRenderThread( EMSCRIPTEN_KEEPALIVE void Renderer_readPixelsRenderThread(
TRenderer *tRenderer, TRenderer *tRenderer,
TView *tView, uint32_t width, uint32_t height, uint32_t xOffset, uint32_t yOffset,
TRenderTarget *tRenderTarget, TRenderTarget *tRenderTarget,
TPixelDataFormat tPixelBufferFormat, TPixelDataFormat tPixelBufferFormat,
TPixelDataType tPixelDataType, TPixelDataType tPixelDataType,
@@ -485,7 +485,7 @@ extern "C"
std::packaged_task<void()> lambda( std::packaged_task<void()> lambda(
[=]() mutable [=]() mutable
{ {
Renderer_readPixels(tRenderer, tView, tRenderTarget, tPixelBufferFormat, tPixelDataType, out, outLength); Renderer_readPixels(tRenderer, width, height, xOffset, yOffset, tRenderTarget, tPixelBufferFormat, tPixelDataType, out, outLength);
PROXY(onComplete(requestId)); PROXY(onComplete(requestId));
}); });
auto fut = _renderThread->add_task(lambda); auto fut = _renderThread->add_task(lambda);