diff --git a/blender-5.2.0/source/blender/web_engine/web_engine_main_state.cpp b/blender-5.2.0/source/blender/web_engine/web_engine_main_state.cpp index fe5187b52..784d1dc75 100644 --- a/blender-5.2.0/source/blender/web_engine/web_engine_main_state.cpp +++ b/blender-5.2.0/source/blender/web_engine/web_engine_main_state.cpp @@ -20725,6 +20725,11 @@ bool web_engine_blend_main_compositor_evaluate(WebBlendMainState *state, * Compositing workspace has no 3D viewport). The GPU compositor path calls * DRW_gpu_context_enable and fails in that state; force CPU for this preview * evaluation and restore the scene setting immediately afterwards. */ + /* The preview evaluation does not run a render engine, so no RenderResult is + * created. Initialize the render state (empty result and default view) so the + * compositor can write its combined output. */ + RE_InitState(render, nullptr, &scene->r, &scene->view_layers, nullptr, + scene->r.xsch, scene->r.ysch, nullptr); const eCompositorDevice previous_device = scene->r.compositor_device; scene->r.compositor_device = SCE_COMPOSITOR_DEVICE_CPU; try { diff --git a/docs/status/WBV2-P1425-001-web-operator-dispatch.md b/docs/status/WBV2-P1425-001-web-operator-dispatch.md index b532ed3b6..0fb379f6f 100644 --- a/docs/status/WBV2-P1425-001-web-operator-dispatch.md +++ b/docs/status/WBV2-P1425-001-web-operator-dispatch.md @@ -462,11 +462,15 @@ `web_engine_blend_main_compositor_evaluate` 中临时把 `scene.r.compositor_device` 切到 CPU(求值后恢复),消除该 GPU 上下文依赖(WASM `198d2f01...`)。 - - 用正确命令 `setCompositorNodeGraph` 提交 `RGB → Composite` 图(原生 - 树确认为 `CompositorNodeRGB.Color → NodeGroupOutput.Image`)后, - `compositorEvaluate` 仍返回 `INVALID_ARGUMENT: COMPOSITOR_RESULT_MISSING`。 - 这是当前 WASM 合成求值的真实残余阻塞,需要补齐 RenderResult/ - have_combined 初始化;证据 `probe-compositor-eval.mjs`。 + - 用正确命令 `setCompositorNodeGraph` 提交 `RGB → Composite` 图后, + 求值仍报 `COMPOSITOR_RESULT_MISSING`;已在该函数中先调用 + `RE_InitState` 创建空 RenderResult/默认视图,使合成输出可写入 + `have_combined`。 + - 复测:`compositorEvaluate` 返回 1024×1024、5,592,408 字节 base64; + Properties → `WASM 合成求值` 显示图像,状态 `WASM 合成 1024×1024`。 + - 结果图原用 `data:` URL 被部署 CSP(`img-src 'self' blob:`)拦截; + 已改为 `URL.createObjectURL` 的 blob URL。WASM `be87a9ad...`。 + 证据 `tools/web/complete/probe-compositor-eval.mjs`。 ## 下一动作 diff --git a/tests/golden/WBV2-P1425-001/continuation-20261113-web-export.json b/tests/golden/WBV2-P1425-001/continuation-20261113-web-export.json index 4350b1c1d..75c2e9ab5 100644 --- a/tests/golden/WBV2-P1425-001/continuation-20261113-web-export.json +++ b/tests/golden/WBV2-P1425-001/continuation-20261113-web-export.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "task": "WBV2-P1425-001", - "updatedAt": "2026-11-14T07:49:00+08:00", + "updatedAt": "2026-11-14T07:54:00+08:00", "status": "in_progress", "focus": "COMPLETE-TUTORIAL-001 backend export gap (USD/Alembic)", "breakpoint": "blender-5.2.0/source/blender/web_engine/CMakeLists.txt (USD wiring); WASM 6ee2b261", @@ -238,9 +238,13 @@ "acceptance": "NOT_CLAIMED" }, "compositorEval": { - "fix": "force scene.r.compositor_device=CPU during the WASM compositor preview evaluation and restore it after (removes the Browser draw manager GPU-context error)", - "residual": "valid RGB→Composite graph still returns COMPOSITOR_RESULT_MISSING (no combined RenderResult); needs render-result initialization", - "wasmSha256": "198d2f01e8205d7316fa56e763d475452e82eb85d8cf3eb888ac98e2264a6da6", + "fix": [ + "force CPU compositor device during preview", + "RE_InitState creates the empty RenderResult/view so have_combined can be written", + "frontend uses a blob URL instead of data: (deployment CSP img-src self blob:)" + ], + "result": "compositorEvaluate returns 1024x1024 (5,592,408 base64 chars); Properties button shows WASM 合成 1024×1024 image", + "wasmSha256": "be87a9ad0b777466253cc802a2482332a7f6b7b4d5cbc2ced513fbb7e7ba1146", "script": "tools/web/complete/probe-compositor-eval.mjs", "acceptance": "NOT_CLAIMED" } diff --git a/tools/web/complete/probe-compositor-eval.mjs b/tools/web/complete/probe-compositor-eval.mjs index dcc0c0f53..46dd782f7 100644 --- a/tools/web/complete/probe-compositor-eval.mjs +++ b/tools/web/complete/probe-compositor-eval.mjs @@ -70,6 +70,18 @@ print('TREE ' + json.dumps({'nodes': nodes, 'links': links}))`); const evaluated = await request({ type: "jsonCommand", cmd: "compositorEvaluate", params: { sceneId } }); const payload = evaluated.result?.json; log("evaluate", JSON.stringify({ ok: evaluated.ok, error: evaluated.error, width: payload?.width, height: payload?.height, pixels: typeof payload?.pixelsBase64 === "string" ? payload.pixelsBase64.length : null })); + const panel = page.locator('[data-testid="scene-pipeline-settings-workbench"]').first(); + await panel.waitFor({ timeout: 30_000 }); + await panel.getByRole("button", { name: "WASM 合成求值", exact: true }).evaluate((element) => element.click()); + for (let index = 0; index < 120; index++) { + await page.waitForTimeout(500); + const ui = await page.evaluate(() => { + const workbench = document.querySelector('[data-testid="scene-pipeline-settings-workbench"]'); + return { status: workbench?.querySelector('output[role="status"]')?.textContent ?? "", hasImage: Boolean(workbench?.querySelector('img')) }; + }); + if (ui.hasImage || (ui.status && !/求值中/.test(ui.status))) { log("ui", JSON.stringify(ui)); break; } + if (index === 119) log("ui timeout", JSON.stringify(ui)); + } } catch (error) { log("probe error", error instanceof Error ? error.message : String(error)); } finally { diff --git a/web/app/public/vendor/blender/web_engine.wasm b/web/app/public/vendor/blender/web_engine.wasm index 6ed2e730c..d02521041 100644 Binary files a/web/app/public/vendor/blender/web_engine.wasm and b/web/app/public/vendor/blender/web_engine.wasm differ diff --git a/web/app/public/wasm-module-manifest.json b/web/app/public/wasm-module-manifest.json index 26f903bcd..523970a56 100644 --- a/web/app/public/wasm-module-manifest.json +++ b/web/app/public/wasm-module-manifest.json @@ -10,7 +10,7 @@ "single": { "fileName": "web_engine.wasm", "url": "/vendor/blender/web_engine.wasm", - "sha256": "198d2f01e8205d7316fa56e763d475452e82eb85d8cf3eb888ac98e2264a6da6" + "sha256": "be87a9ad0b777466253cc802a2482332a7f6b7b4d5cbc2ced513fbb7e7ba1146" }, "pthread": { "fileName": "web_engine.wasm", @@ -27,7 +27,7 @@ "single": { "fileName": "web_engine.wasm", "url": "/vendor/blender/web_engine.wasm", - "sha256": "198d2f01e8205d7316fa56e763d475452e82eb85d8cf3eb888ac98e2264a6da6" + "sha256": "be87a9ad0b777466253cc802a2482332a7f6b7b4d5cbc2ced513fbb7e7ba1146" }, "pthread": { "fileName": "web_engine.wasm", @@ -44,7 +44,7 @@ "single": { "fileName": "web_engine.wasm", "url": "/vendor/blender/web_engine.wasm", - "sha256": "198d2f01e8205d7316fa56e763d475452e82eb85d8cf3eb888ac98e2264a6da6" + "sha256": "be87a9ad0b777466253cc802a2482332a7f6b7b4d5cbc2ced513fbb7e7ba1146" }, "pthread": { "fileName": "web_engine.wasm", @@ -61,7 +61,7 @@ "single": { "fileName": "web_engine.wasm", "url": "/vendor/blender/web_engine.wasm", - "sha256": "198d2f01e8205d7316fa56e763d475452e82eb85d8cf3eb888ac98e2264a6da6" + "sha256": "be87a9ad0b777466253cc802a2482332a7f6b7b4d5cbc2ced513fbb7e7ba1146" }, "pthread": { "fileName": "web_engine.wasm", diff --git a/web/app/src/app/App.tsx b/web/app/src/app/App.tsx index a7b17545d..4fdb8484b 100644 --- a/web/app/src/app/App.tsx +++ b/web/app/src/app/App.tsx @@ -2986,7 +2986,12 @@ function Properties({ selectedEdgeIndices, nonMeshGeometryBuffers, client, snaps image.data.set(bytes.subarray((result.height - 1 - row) * rowBytes, (result.height - row) * rowBytes), row * rowBytes); } context.putImageData(image, 0, 0); - setCompositorEvalUrl(canvas.toDataURL("image/png")); + const pngUrl = canvas.toDataURL("image/png"); + const pngBytes = Uint8Array.from(atob(pngUrl.slice(pngUrl.indexOf(",") + 1)), (character) => character.charCodeAt(0)); + setCompositorEvalUrl((current) => { + if (current) URL.revokeObjectURL(current); + return URL.createObjectURL(new Blob([pngBytes], { type: "image/png" })); + }); setCompositorEvalStatus(`WASM 合成 ${result.width}×${result.height}`); } catch (error) { diff --git a/web/app/src/vendor/blender/web_engine.wasm b/web/app/src/vendor/blender/web_engine.wasm index 6ed2e730c..d02521041 100644 Binary files a/web/app/src/vendor/blender/web_engine.wasm and b/web/app/src/vendor/blender/web_engine.wasm differ