@meimu/mutracer 0.3.0 → 0.3.1

package/lib/renderer/WGPURenderingPipeline.js

@@ -1,8 +1,8 @@
-import { hdrResolveWGSL } from './wgsl/compose.frag.wgsl.js';
+import { hdrResolveWGSL, TONE_MAPPING_MODES } from './wgsl/compose.frag.wgsl.js';
 import { oidnAuxiliaryDefine } from './wgsl/oidnAuxiliary.wgsl.js';
 import { displayAovKind, DEFAULT_AOV_DISPLAY } from './aovDisplay.js';
 import { WGPUAov } from './WGPUAov.js';
-import { aovMask } from './aov.js';
+import { aovMask, COMPACT_AOV_KINDS, DISPLAY_AOV_SAMPLE_CAP } from './aov.js';
 import { DisplayPostProcess } from './DisplayPostProcess.js';
 import { customDenoiseLayersMain, customDenoiseCoverageMain } from './wgsl/customDenoise.wgsl.js';
 import { WGPUCanvasSurface } from './WGPUCanvasSurface.js';
@@ -17,6 +17,7 @@ import WGPURayTracePass from './WGPURayTracePass.js';
 import { composeMain, composeDefine, compositeDenoiseOutputMain, compositeDenoiseDisplayMain, linearToSrgbDefine } from './wgsl/compose.frag.wgsl.js';
 import halton from './halton.js';
 import { makeTileRender, makeTileRenderWithPredict } from './TileRender.js';
+import { WORKGROUP_SIZE } from './wgsl/rayTrace.compute.js';
 import { WGPURayTraceOutputPass } from './WGPURayTraceOutput.js';
 import { vec3 } from '../math.js';
 import WGPUBloomPass from './WGPUBloomPass.js';
@@ -27,16 +28,16 @@ export const oidnAlbedoSrgbEncodeMain = /* wgsl */ `
 if (globalId.x >= u32(imageSize.x) || globalId.y >= u32(imageSize.y)) { return; }
 let index = globalId.x + globalId.y * u32(imageSize.x);
 let raw = textureLoad(in_albedo, vec2u(globalId.xy), 0);
-let encoded = sQ(raw.rgb);
+let encoded = uq(raw.rgb);
 out_albedo[index] = vec4f(encoded, raw.a);
 `;
 export const oidnAlbedoSrgbDecodeMain = /* wgsl */ `
 if (globalId.x >= u32(imageSize.x) || globalId.y >= u32(imageSize.y)) { return; }
 let index = globalId.x + globalId.y * u32(imageSize.x);
 let filtered = in_albedo[index];
-let linear = sP(filtered.rgb);
+let linear = uo(filtered.rgb);
 var result = linear;
-let jj = textureLoad(in_rawAlbedo, vec2i(globalId.xy), 0).a;
+let jN = textureLoad(in_rawAlbedo, vec2i(globalId.xy), 0).a;
 if (preserveSurfaceTexture != 0u) {
 
 
@@ -44,27 +45,27 @@ if (preserveSurfaceTexture != 0u) {
 let pixel = vec2i(globalId.xy);
 let center = textureLoad(in_rawNormal, pixel, 0);
 let n = normalize(center.rgb * 2.0 - 1.0 + vec3f(1e-8));
-var nS = 0.0;
+var oR = 0.0;
 for (var y = -1; y <= 1; y++) {
 for (var x = -1; x <= 1; x++) {
-let vI = textureLoad(in_rawNormal,
+let xA = textureLoad(in_rawNormal,
 clamp(pixel + vec2i(x, y), vec2i(0), imageSize - 1), 0);
-let nn = normalize(vI.rgb * 2.0 - 1.0 + vec3f(1e-8));
-nS = max(nS,
-max(1.0 - dot(n, nn), abs(center.a - vI.a)));
+let nn = normalize(xA.rgb * 2.0 - 1.0 + vec3f(1e-8));
+oR = max(oR,
+max(1.0 - dot(n, nn), abs(center.a - xA.a)));
 }
 }
-let wc = smoothstep(0.02, 0.1, nS);
+let xY = smoothstep(0.02, 0.1, oR);
 let raw = clamp(textureLoad(in_rawAlbedo, pixel, 0).rgb,
 vec3f(0.0), vec3f(1.0));
-result = mix(raw, linear, wc);
+result = mix(raw, linear, xY);
 }
-out_albedo[index] = vec4f(result, jj);
+out_albedo[index] = vec4f(result, jN);
 `;
 export const oidnNormalSanitizeMain = /* wgsl */ `
 if (globalId.x >= u32(imageSize.x) || globalId.y >= u32(imageSize.y)) { return; }
 let index = globalId.x + globalId.y * u32(imageSize.x);
-out_normal[index] = vec4f(rG(in_normal[index].rgb), 1.0);
+out_normal[index] = vec4f(sW(in_normal[index].rgb), 1.0);
 `;
 function createTimeQuery(device) {
     try {
@@ -231,7 +232,7 @@ function makeWGPUAccumulationTarget(canvas, device, rayTracePass, surface, scrat
         }).query
         : undefined;
     const tileRender = makeTileRender();
-    const tileRenderWithPredict = timeQuery ? makeTileRenderWithPredict() : undefined;
+    const tileRenderWithPredict = timeQuery ? makeTileRenderWithPredict(WORKGROUP_SIZE) : undefined;
     tileRender.setDesiredMsPerTile(maxTimePerTile);
     tileRenderWithPredict?.setDesiredMsPerTile(maxTimePerTile);
     function invalidateTilePrediction() {
@@ -266,9 +267,9 @@ function makeWGPUAccumulationTarget(canvas, device, rayTracePass, surface, scrat
 var color = load_colorTex(uv, 0);
 let coverage = clamp(load_coverageTex(uv, 0).a, 0.0, 1.0);
 color = vec4f(
-jx(color.r, coverage, flatBackgroundColor.a > 0.5, true),
-jx(color.g, coverage, flatBackgroundColor.a > 0.5, true),
-jx(color.b, coverage, flatBackgroundColor.a > 0.5, true), color.a);
+ka(color.r, coverage, flatBackgroundColor.a > 0.5, true),
+ka(color.g, coverage, flatBackgroundColor.a > 0.5, true),
+ka(color.b, coverage, flatBackgroundColor.a > 0.5, true), color.a);
 output.color = color;
 `
     }));
@@ -392,11 +393,11 @@ output.color = color;
     oidnNormalSanitizePass.setOutputParams({ normal: { channels: 4 } });
     const outputPass = scratch.get('outputPass', () => new WGPUFullQuadPass('output', device, {
         fsMain: /* wgsl */ `
-let xW = min(
+let zU = min(
 vec2i(uv2 * vec2f(colorTexRegion())),
 vec2i(colorTexRegion()) - vec2i(1)
 );
-var color = load_colorTex(xW, 0);
+var color = load_colorTex(zU, 0);
 color = vec4(color.rgb * color.a, color.a);
 output.color = color;
 `,
@@ -470,7 +471,7 @@ output.color = color;
                         estimatedFullFrameTimeMs: traceTime * submittedTileCount,
                         tileCount: submittedTileCount
                     };
-                    submittedTileRenderWithPredict.setLastTraceTime(traceTime);
+                    submittedTileRenderWithPredict.setLastTraceTime(traceTime, tiles[0], tiles[1]);
                 }
                 activeTimeQuery.resultBuffer.unmap();
             }).catch(() => {
@@ -646,10 +647,12 @@ output.color = color;
         finishPresentation(encoder, displayTexture);
     }
     function finishPresentation(encoder, displayTexture) {
+        const presentationWidth = displayAovKind(output) ? displayTexture.width : renderWidth;
+        const presentationHeight = displayAovKind(output) ? displayTexture.height : renderHeight;
         const activeHDRPeakMeter = hdrOutputActive
             ? (hdrPeakMeter ??= scratch.get('hdrPeak', () => new WGPUHDRPeakMeter(device)))
             : undefined;
-        const hdrPeakReadbackSubmitted = activeHDRPeakMeter?.encode(encoder, displayTexture, renderWidth, renderHeight) ?? false;
+        const hdrPeakReadbackSubmitted = activeHDRPeakMeter?.encode(encoder, displayTexture, presentationWidth, presentationHeight) ?? false;
         if (output === 'normal' || output === 'albedo') {
             displayTrace?.push('AOV:Raw');
             displayTexture = getFrameInput(output);
@@ -658,14 +661,14 @@ output.color = color;
             displayTrace?.push('AOV:Raw');
             displayTexture = getFrameInput('shadowCatcher');
         }
-        if (displayTexture.width < renderWidth || displayTexture.height < renderHeight) {
-            readbackPass.setSize(renderWidth, renderHeight);
+        if (displayTexture.width < presentationWidth || displayTexture.height < presentationHeight) {
+            readbackPass.setSize(presentationWidth, presentationHeight);
             readbackPass.createPass(encoder, { inputTex: displayTexture });
             displayTexture = readbackPass.getOutput('color');
         }
         // Keep the completed denoise visible until its replacement is ready.
         if (!(preserveDenoisedOutput && output === 'final' && !denoiseValid && presentationDenoised)) {
-            const width = renderWidth, height = renderHeight;
+            const width = presentationWidth, height = presentationHeight;
             if (!presentationTexture || presentationTexture.width !== width || presentationTexture.height !== height || presentationTexture.format !== displayTexture.format) {
                 const previous = presentationTexture;
                 presentationTexture = device.createTexture({
@@ -690,6 +693,8 @@ output.color = color;
         postProcessPending = false;
         drawPostProcess(device.createCommandEncoder(), false, true);
     }
+    const aovResolution = () => execution?.aovResolution === 'display' ? { width: canvas.width, height: canvas.height } : undefined;
+    const compactAov = () => !!aovResolution() && !!execution?.aovs?.every(kind => COMPACT_AOV_KINDS.includes(kind));
     function trace(camera, maxSamples) {
         applyTraceQuality();
         // A call to draw means accumulation has been invalidated. Cancel OIDN
@@ -708,7 +713,7 @@ output.color = color;
         // complete image stay valid, and only Render's restart discards them.
         if (rayTracePass.isCompilingShader() || !rayTracePass.isPipelineReady())
             return true;
-        if (execution?.aovs?.length && !rayTracePass.prepareAovs(execution.aovs))
+        if (execution?.aovs?.length && !rayTracePass.prepareAovs(execution.aovs, compactAov()))
             return true;
         const resetAccumulation = isFirstFrame;
         if (resetAccumulation)
@@ -816,7 +821,13 @@ output.color = color;
             return false;
         }
         if (sampleCount !== frameSampleCount && execution?.aovs?.length) {
-            rayTracePass.renderAovs(aov, camera, sampleCount, execution.aovSamples ?? 16, execution.aovs);
+            // Display AOVs only add detail: keep the first beauty image's latency and
+            // spread their full-canvas samples over frames instead of batching them.
+            // The converging trace completes any remaining samples.
+            const display = aovResolution();
+            const aovTarget = display && sampleCount < maxSamples ? Math.min(sampleCount - 1, aov.samples + 1) : sampleCount;
+            if (aovTarget > 0)
+                rayTracePass.renderAovs(aov, camera, aovTarget, Math.min(execution.aovSamples ?? 16, display ? DISPLAY_AOV_SAMPLE_CAP : Infinity), execution.aovs, display);
         }
         if (sampleCount !== frameSampleCount && realtime && realtimeDeferPostProcess && sampleCount < renderSampleTarget) {
             postProcessPending = true;
@@ -892,13 +903,7 @@ output.color = color;
     }
     function setToneMappingParams(params) {
         const newExposure = params.exposure ?? 1;
-        const newToneMappingMode = {
-            agx: 0,
-            aces: 1,
-            cineon: 2,
-            reinhard: 3,
-            linear: 4
-        }[params.toneMapping ?? 'agx'] ?? 0;
+        const newToneMappingMode = TONE_MAPPING_MODES[params.toneMapping ?? 'agx'] ?? 0;
         const newContrast = params.contrast ?? 1;
         const newSaturation = params.saturation ?? 1;
         const newTemperature = params.temperature ?? 0;
@@ -1333,8 +1338,8 @@ output.color = color;
             if (settings.aovs?.length && (!Number.isInteger(settings.aovSamples ?? 16) || (settings.aovSamples ?? 16) < 1))
                 throw new RangeError('aovSamples must be a positive integer');
             const previousMask = aovMask(execution?.aovs ?? []), nextMask = aovMask(settings.aovs ?? []);
-            if (previousMask !== nextMask || execution?.aovSamples !== settings.aovSamples)
-                aov.samples = 0;
+            if (previousMask !== nextMask || execution?.aovSamples !== settings.aovSamples || execution?.aovResolution !== settings.aovResolution)
+                aov.reset();
             execution = { ...settings, aovs: [...(settings.aovs ?? [])] };
             // Presentation may still name the previous preview's AOV. Drop that
             // selection before tracing with a smaller set; Display validates and
@@ -1402,15 +1407,16 @@ output.color = color;
             isFirstFrame = true;
             sampleCount = 0;
         },
+        getAovTexture(kind) { return execution?.aovs?.includes(kind) ? aov.texture(kind) : undefined; },
         getOutputTexture(kind) {
             flushPostProcess();
             if (kind === 'hdr')
                 return resolvedSamples > 0 ? getFrameInput('color') : undefined;
             return displayPostProcess.output ?? presentationTexture;
         },
-        applyPostProcesses(passes, render) {
+        applyPostProcesses(passes, render, options, crop) {
             if (presentationTexture)
-                displayPostProcess.run(presentationTexture, passes, render);
+                displayPostProcess.run(presentationTexture, passes, render, canvas, options, crop);
         },
         trace,
         drawPostProcess() {
@@ -1465,7 +1471,7 @@ output.color = color;
                 throw pipelineError;
             if (rayTracePass.isCompilingShader() || !rayTracePass.isPipelineReady())
                 return false;
-            return rayTracePass.renderAovs(aov, camera, samples, execution.aovSamples ?? 16, execution.aovs);
+            return rayTracePass.renderAovs(aov, camera, samples, Math.min(execution.aovSamples ?? 16, aovResolution() ? DISPLAY_AOV_SAMPLE_CAP : Infinity), execution.aovs, aovResolution());
         },
         async readAov(kind) {
             if (!execution?.aovs?.includes(kind) || !aovCamera || (sampleCount < 1 && aov.samples < 1))
@@ -1481,7 +1487,7 @@ output.color = color;
                 if (pipelineError)
                     throw pipelineError;
                 if (!rayTracePass.isCompilingShader() && rayTracePass.isPipelineReady() &&
-                    rayTracePass.renderAovs(aov, aovCamera, Math.max(sampleCount, aov.samples), execution.aovSamples ?? 16, execution.aovs))
+                    rayTracePass.renderAovs(aov, aovCamera, Math.max(sampleCount, aov.samples), Math.min(execution.aovSamples ?? 16, aovResolution() ? DISPLAY_AOV_SAMPLE_CAP : Infinity), execution.aovs, aovResolution()))
                     break;
                 // Display frames stop on a hidden page, but compilation still completes.
                 await new Promise(resolve => setTimeout(resolve, 16));