From c2818cbb1157093f80efd2a85cea0cf1509f565e Mon Sep 17 00:00:00 2001 From: mac Date: Sun, 1 Nov 2026 20:19:18 +0800 Subject: [PATCH] feat: verify merged primary, native balance wheel and persistent variable spider rendering --- template/sources/RegisteredParameters.json | 2 +- tools/create_spider_host_fixture.py | 15 + verification/SpiderAndBalance.json | 1233 ++++++++++++++++++++ verification/SpiderMath.json | 10 + 大鱼调色/Plugin/DYDiagnostics.mm | 78 +- 大鱼调色/Plugin/DYInspector.mm | 2 +- 6 files changed, 1332 insertions(+), 8 deletions(-) create mode 100644 tools/create_spider_host_fixture.py create mode 100644 verification/SpiderAndBalance.json create mode 100644 verification/SpiderMath.json diff --git a/template/sources/RegisteredParameters.json b/template/sources/RegisteredParameters.json index b17f9ae..2fde659 100644 --- a/template/sources/RegisteredParameters.json +++ b/template/sources/RegisteredParameters.json @@ -3067,7 +3067,7 @@ "template/tools/dump_model.mm": "2ef22e010e0cae15b73107d39fb2c125f6049b1e5405e88078f936cf29e79350", "大鱼调色/Plugin/DYCSTTypes.h": "3372e3cd77248eeb374e54675d2902befceea8e00a2afc4f9543116ef3027696", "大鱼调色/Plugin/DYColorManagement.h": "b0a4cd1b8c45dbce90a7b4f30f72ebf95ecd382895e74e3bfeda0f7cdb185157", - "大鱼调色/Plugin/DYModel.h": "ff10bd26d4abab1e610e392841b3bf8551f7be1a245a6dca3a13e8f2a2d27adf", + "大鱼调色/Plugin/DYModel.h": "80e88add97deeac7a9dc47d12f68b0245905786297de2e6553b3da15c729da6e", "大鱼调色/Plugin/DYModel.mm": "f485aba06c9b4de871e95761d69b3df1001843bcf7226aba2ed278d596358364", "大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9", "大鱼调色/Plugin/DYUniforms.h": "8ef480025c739b29f55884ba0c7218e9d6fd8d80c46cfc72d6ee3da90215abe4", diff --git a/tools/create_spider_host_fixture.py b/tools/create_spider_host_fixture.py new file mode 100644 index 0000000..cd6d53d --- /dev/null +++ b/tools/create_spider_host_fixture.py @@ -0,0 +1,15 @@ +#!/usr/bin/env python3 +"""Create an isolated synthetic FCP project for the native spider and wheel.""" +from pathlib import Path +import runpy +import xml.etree.ElementTree as ET +root=Path(__file__).resolve().parent.parent +runpy.run_path(str(root/'tools/create_host_fixture.py')) +qa=Path.home()/'Library/Caches/CodexBuilds/com.dayu.color/fcp-qa' +tree=ET.parse(qa/'大鱼调色_正式版验收.fcpxml') +tree.find('.//event').set('name','大鱼调色_蜘蛛盘与白平衡验收') +tree.find('.//project').set('name','大鱼调色_1.3_蜘蛛盘与白平衡') +ET.indent(tree) +output=qa/'大鱼调色_1.3_蜘蛛盘与白平衡.fcpxml' +output.write_text('\n\n'+ET.tostring(tree.getroot(),encoding='unicode')+'\n') +print(output) diff --git a/verification/SpiderAndBalance.json b/verification/SpiderAndBalance.json new file mode 100644 index 0000000..504f0e3 --- /dev/null +++ b/verification/SpiderAndBalance.json @@ -0,0 +1,1233 @@ +{ + "bundlePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/DerivedData/Build/Products/Release/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit", + "checks": 198, + "gpu": "Apple M4", + "limitations": [ + "Finite states and a 64x48 frame; live FCP discovery, inspector interaction, timeline persistence and real host export require separate acceptance.", + "Input profiles checked for load/render/finite output; independent color accuracy is covered by separate LUT/kernel evidence." + ], + "pass": true, + "results": [ + { + "error": "未提供错误信息", + "name": "runtime-directory", + "pass": true, + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/5AF8CE34-989A-4370-8611-D2DF3D3A59A3" + }, + { + "descriptors": 234, + "name": "descriptor-unique-id-offset-key", + "pass": true, + "sections": 15, + "uniformBytes": 1104 + }, + { + "name": "finite-real-model-defaults", + "pass": true + }, + { + "name": "all-module-eyes-enabled-by-default", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "native-parameter-creation", + "pass": true + }, + { + "name": "native-get-set-model-roundtrip", + "pass": true + }, + { + "name": "model-clamps-host-out-of-range", + "pass": true + }, + { + "name": "model-rejects-host-nonfinite", + "pass": true + }, + { + "archiveBytes": 659, + "error": "未提供错误信息", + "name": "secure-asset-archive-roundtrip", + "pass": true + }, + { + "name": "native-custom-asset-get-set", + "pass": true + }, + { + "name": "asset-copy-is-independent", + "pass": true + }, + { + "modules": 12, + "name": "default-primary-spider-base-expanded-all-eyes-on", + "pass": true + }, + { + "name": "all-disclosure-actions-preserve-every-render-parameter", + "pass": true + }, + { + "name": "eye-only-toggles-enable-retains-disclosure", + "pass": true + }, + { + "name": "expanding-disabled-module-keeps-it-disabled", + "pass": true + }, + { + "name": "inspector-recreation-restores-independent-disclosure", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "secure-disclosure-archive-roundtrip", + "pass": true + }, + { + "name": "legacy-inspector-retains-input-and-blackwhite-behavior", + "pass": true + }, + { + "name": "working-space-shared-by-primary-and-output", + "pass": true + }, + { + "name": "basis-raw-controls-use-reference-conversion", + "pass": true + }, + { + "name": "unsupported-basis-curve-adapts-through-intermediate", + "pass": true + }, + { + "name": "primary-balance-wheel-restored-and-palette-loaded", + "pass": true + }, + { + "name": "single-primary-card-no-bypass-checkboxes", + "pass": true + }, + { + "angleDegrees": 277.8014221191406, + "name": "balance-wheel-reference-orientation-and-fine-drag", + "pass": true, + "strength": 0.1196703314781189 + }, + { + "name": "balance-drag-one-host-undo-group", + "pass": true + }, + { + "name": "balance-double-click-neutral", + "pass": true + }, + { + "name": "spider-default-six-by-six-31-nodes", + "pass": true + }, + { + "name": "spider-single-drag-spoke-following-and-pin", + "pass": true + }, + { + "name": "spider-drag-one-host-undo-group", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "spider-archive-retains-mesh-pins-and-lut-paths", + "pass": true + }, + { + "name": "complete-version-three-preset-includes-mesh", + "pass": true + }, + { + "name": "spider-json-preset-exact-roundtrip", + "pass": true + }, + { + "name": "spider-json-rejects-unsupported-topology", + "pass": true + }, + { + "name": "spider-archive-rejects-nonfinite-coordinates", + "pass": true + }, + { + "name": "spider-independent-resolution-and-resample", + "pass": true + }, + { + "name": "spider-reset-preserves-density", + "pass": true + }, + { + "name": "spider-command-multiselect", + "pass": true + }, + { + "name": "spider-ring-selection", + "pass": true + }, + { + "name": "spider-spoke-selection", + "pass": true + }, + { + "name": "spider-shift-pin", + "pass": true + }, + { + "name": "spider-pinned-anchor-still-draggable", + "pass": true + }, + { + "name": "spider-right-click-reset-unpins", + "pass": true + }, + { + "name": "spider-escape-restores-coordinates-and-pins", + "pass": true + }, + { + "name": "native-interaction-window-never-visible", + "pass": true + }, + { + "name": "metal-device", + "pass": true + }, + { + "name": "real-iosurface-image-tiles", + "pass": true + }, + { + "error": "", + "name": "renderer-default-pass", + "pass": true + }, + { + "changedComponents": 251, + "maxAbsoluteError": 0.000244140625, + "name": "transparent-premultiplied-neutral", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "未提供错误信息", + "name": "independent-installed-cst-reference-loaded", + "pass": true, + "path": "/Library/Plug-Ins/FxPlug/大鱼CST.app/Contents/PlugIns/大鱼CST XPC Service.pluginkit/Contents/Resources/default.metallib" + }, + { + "error": "", + "name": "cst-case-00-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 28, + "inputGamut": 27, + "maximumError": 0, + "name": "cst-case-00-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-01-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 2, + "inputGamut": 23, + "maximumError": 1.52587890625e-05, + "name": "cst-case-01-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-02-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 4, + "inputGamut": 4, + "maximumError": 0, + "name": "cst-case-02-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-03-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 5, + "inputGamut": 5, + "maximumError": 0, + "name": "cst-case-03-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-04-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 6, + "inputGamut": 6, + "maximumError": 0, + "name": "cst-case-04-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-05-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 8, + "inputGamut": 7, + "maximumError": 0, + "name": "cst-case-05-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-06-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 9, + "inputGamut": 7, + "maximumError": 1.52587890625e-05, + "name": "cst-case-06-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-07-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 11, + "inputGamut": 10, + "maximumError": 0, + "name": "cst-case-07-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-08-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 12, + "inputGamut": 28, + "maximumError": 0, + "name": "cst-case-08-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-09-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 15, + "inputGamut": 23, + "maximumError": 0, + "name": "cst-case-09-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-10-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 16, + "inputGamut": 17, + "maximumError": 7.62939453125e-06, + "name": "cst-case-10-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-11-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 21, + "inputGamut": 23, + "maximumError": 0, + "name": "cst-case-11-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-12-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 22, + "inputGamut": 21, + "maximumError": 1.52587890625e-05, + "name": "cst-case-12-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-13-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 25, + "inputGamut": 24, + "maximumError": 0, + "name": "cst-case-13-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-14-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 27, + "inputGamut": 25, + "maximumError": 0, + "name": "cst-case-14-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-15-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 30, + "inputGamut": 23, + "maximumError": 1.52587890625e-05, + "name": "cst-case-15-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-16-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 29, + "inputGamut": 23, + "maximumError": 0, + "name": "cst-case-16-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 10 + }, + { + "error": "", + "name": "cst-case-17-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 28, + "inputGamut": 27, + "maximumError": 0, + "name": "cst-case-17-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 1 + }, + { + "error": "", + "name": "cst-case-18-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 28, + "inputGamut": 27, + "maximumError": 0, + "name": "cst-case-18-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 20 + }, + { + "error": "", + "name": "cst-case-19-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 28, + "inputGamut": 27, + "maximumError": 0, + "name": "cst-case-19-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 30 + }, + { + "error": "", + "name": "cst-case-20-render", + "pass": true + }, + { + "actualValue": 0, + "components": 12288, + "inputCurve": 28, + "inputGamut": 27, + "maximumError": 0, + "name": "cst-case-20-independent-pixels", + "nonfinite": 0, + "pass": true, + "referenceValue": 0, + "workingCurve": 1002 + }, + { + "error": "", + "name": "blackwhite-full-render", + "pass": true + }, + { + "changedComponents": 7368, + "maxAbsoluteError": 0.5289306640625, + "name": "blackwhite-mix-100-affects-frame", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "blackwhite-half-render", + "pass": true + }, + { + "name": "blackwhite-half-mix-is-continuous", + "pass": true + }, + { + "error": "", + "name": "blackwhite-eye-off-render", + "pass": true + }, + { + "name": "blackwhite-eye-bypasses-retained-mix", + "pass": true + }, + { + "affectedComponents": 1288, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-6-6", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-6-6", + "pass": true + }, + { + "affectedComponents": 1240, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-6-8", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-6-8", + "pass": true + }, + { + "affectedComponents": 1161, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-6-24", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-6-24", + "pass": true + }, + { + "affectedComponents": 612, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-12-6", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-12-6", + "pass": true + }, + { + "affectedComponents": 604, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-12-8", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-12-8", + "pass": true + }, + { + "affectedComponents": 571, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-12-24", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-12-24", + "pass": true + }, + { + "affectedComponents": 315, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-24-6", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-24-6", + "pass": true + }, + { + "affectedComponents": 314, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-24-8", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-24-8", + "pass": true + }, + { + "affectedComponents": 309, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-24-24", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-24-24", + "pass": true + }, + { + "error": "", + "name": "primary-master-active-render", + "pass": true + }, + { + "error": "", + "name": "primary-master-inactive-render", + "pass": true + }, + { + "name": "primary-master-controls-complete-cst-pipeline", + "pass": true + }, + { + "invalidComponents": 0, + "name": "renderer-alpha-contract", + "pass": true + }, + { + "bytes": 921600, + "name": "renderer-analysis-320x180", + "pass": true + }, + { + "blacks": -36, + "contrast": 16, + "exposure": -0.29, + "highlights": 0, + "name": "renderer-auto-grade-integration", + "pass": true, + "saturation": -5, + "shadows": -22, + "temperature": -1, + "tint": 1, + "vibrance": -6, + "whites": 6 + }, + { + "bytes": 921600, + "error": "", + "name": "look-preview-top-left-is-original-analysis", + "pass": true + }, + { + "all180RowsCompared": true, + "analysisKeepsPhysicalRowOrder": true, + "error": "", + "name": "look-preview-bottom-left-flips-only-browser-rows", + "pass": true + }, + { + "name": "preview-invalidation-clears-analysis-and-browser", + "pass": true + }, + { + "error": "", + "name": "cst-export-production-sample", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "cube-export-includes-cst-primary-and-matches-production", + "pass": true, + "triples": 35937 + }, + { + "error": "未提供错误信息", + "name": "cube-export-includes-spider-warp", + "pass": true, + "triples": 35937 + }, + { + "error": "", + "name": "renderer-exposure-pass", + "pass": true + }, + { + "changedComponents": 7374, + "maxAbsoluteError": 0.39453125, + "name": "exposure-affects-actual-frame", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "renderer-base-bypass-pass", + "pass": true + }, + { + "changedComponents": 0, + "maxAbsoluteError": 0, + "name": "base-group-bypass", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "renderer-white-balance-pass", + "pass": true + }, + { + "changedComponents": 7362, + "maxAbsoluteError": 0.3515625, + "name": "white-balance-real-table-frame", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "renderer-color-bypass-pass", + "pass": true + }, + { + "changedComponents": 0, + "maxAbsoluteError": 0, + "name": "color-group-bypass", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "renderer-hsl-pass", + "pass": true + }, + { + "changedComponents": 7347, + "maxAbsoluteError": 0.13134765625, + "name": "hsl-real-table-frame", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "disabled-hsl-bypasses-retained-adjustments-render", + "pass": true + }, + { + "changedComponents": 0, + "maxAbsoluteError": 0, + "name": "disabled-hsl-bypasses-retained-adjustments", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "renderer-grading-pass", + "pass": true + }, + { + "changedComponents": 7347, + "maxAbsoluteError": 0.09033203125, + "name": "grading-real-table-frame", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "disabled-grading-bypasses-retained-adjustments-render", + "pass": true + }, + { + "changedComponents": 0, + "maxAbsoluteError": 0, + "name": "disabled-grading-bypasses-retained-adjustments", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "input-profile-01-load-render", + "pass": true + }, + { + "changedComponents": 7373, + "maxAbsoluteError": 0.604736328125, + "name": "input-profile-01-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 8570, + "pass": true + }, + { + "error": "", + "name": "input-profile-02-load-render", + "pass": true + }, + { + "changedComponents": 7374, + "maxAbsoluteError": 0.610595703125, + "name": "input-profile-02-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 9311, + "pass": true + }, + { + "error": "", + "name": "input-profile-03-load-render", + "pass": true + }, + { + "changedComponents": 7374, + "maxAbsoluteError": 0.92999267578125, + "name": "input-profile-03-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "input-profile-04-load-render", + "pass": true + }, + { + "changedComponents": 7373, + "maxAbsoluteError": 0.668701171875, + "name": "input-profile-04-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 9785, + "pass": true + }, + { + "error": "", + "name": "input-profile-05-load-render", + "pass": true + }, + { + "changedComponents": 7374, + "maxAbsoluteError": 0.330078125, + "name": "input-profile-05-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "input-profile-06-load-render", + "pass": true + }, + { + "changedComponents": 7372, + "maxAbsoluteError": 0.9000244140625, + "name": "input-profile-06-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 9790, + "pass": true + }, + { + "error": "", + "name": "input-profile-07-load-render", + "pass": true + }, + { + "changedComponents": 7372, + "maxAbsoluteError": 0.88970947265625, + "name": "input-profile-07-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 9798, + "pass": true + }, + { + "error": "", + "name": "input-profile-08-load-render", + "pass": true + }, + { + "changedComponents": 7372, + "maxAbsoluteError": 0.599365234375, + "name": "input-profile-08-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 9827, + "pass": true + }, + { + "error": "", + "name": "input-profile-09-load-render", + "pass": true + }, + { + "changedComponents": 7372, + "maxAbsoluteError": 0.413330078125, + "name": "input-profile-09-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 9508, + "pass": true + }, + { + "error": "", + "name": "input-profile-10-load-render", + "pass": true + }, + { + "changedComponents": 7369, + "maxAbsoluteError": 0.47119140625, + "name": "input-profile-10-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 9419, + "pass": true + }, + { + "error": "", + "name": "input-profile-11-load-render", + "pass": true + }, + { + "changedComponents": 7369, + "maxAbsoluteError": 0.47119140625, + "name": "input-profile-11-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 9419, + "pass": true + }, + { + "error": "", + "name": "input-profile-12-load-render", + "pass": true + }, + { + "changedComponents": 7372, + "maxAbsoluteError": 0.5775146484375, + "name": "input-profile-12-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "input-profile-13-load-render", + "pass": true + }, + { + "changedComponents": 7373, + "maxAbsoluteError": 0.595947265625, + "name": "input-profile-13-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 9774, + "pass": true + }, + { + "error": "", + "name": "input-profile-14-load-render", + "pass": true + }, + { + "changedComponents": 7372, + "maxAbsoluteError": 0.645263671875, + "name": "input-profile-14-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "input-profile-15-load-render", + "pass": true + }, + { + "changedComponents": 7373, + "maxAbsoluteError": 0.66650390625, + "name": "input-profile-15-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 8959, + "pass": true + }, + { + "error": "", + "name": "input-profile-16-load-render", + "pass": true + }, + { + "changedComponents": 7366, + "maxAbsoluteError": 0.586669921875, + "name": "input-profile-16-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "input-profile-17-load-render", + "pass": true + }, + { + "changedComponents": 7374, + "maxAbsoluteError": 0.7840576171875, + "name": "input-profile-17-finite-nonzero", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "disabled-input-bypasses-retained-profile-render", + "pass": true + }, + { + "changedComponents": 0, + "maxAbsoluteError": 0, + "name": "disabled-input-bypasses-retained-profile", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "renderer-input-analysis-pass", + "pass": true + }, + { + "changedComponents": 172094, + "maxAbsoluteError": 0.7686275239102542, + "name": "analysis-applies-selected-input-LUT", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "temporary-look-file", + "pass": true + }, + { + "error": "", + "name": "renderer-five-look-pass", + "pass": true + }, + { + "changedComponents": 7364, + "maxAbsoluteError": 0.52490234375, + "name": "five-look-mixes-affect-frame", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "disabled-look-bypasses-retained-LUTs-render", + "pass": true + }, + { + "changedComponents": 0, + "maxAbsoluteError": 0, + "name": "disabled-look-bypasses-retained-LUTs", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "未提供错误信息", + "name": "renderer-export-33cube", + "pass": true, + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/5AF8CE34-989A-4370-8611-D2DF3D3A59A3/diagnostic-export.cube" + }, + { + "bytes": 1186074, + "name": "export-33cube-data-contract", + "nonzeroRows": 35937, + "pass": true, + "rows": 35937 + }, + { + "name": "external-large-cube-written", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "external-decode-and-gpu-upload-complete", + "pass": true + }, + { + "heartbeats": 0, + "maximumGapMS": 87.83329161815345, + "name": "external-activation-main-loop-responsive", + "pass": true + }, + { + "error": "", + "name": "external-first-frame-after-preparation", + "pass": true + }, + { + "name": "external-lut-affects-frame", + "pass": true + }, + { + "name": "external-source-removed-for-no-io-check", + "pass": true + }, + { + "name": "external-preview-and-gpu-cache-churn", + "pass": true + }, + { + "error": "", + "name": "external-render-with-source-unavailable-after-cache-churn", + "pass": true + }, + { + "changedComponents": 0, + "maxAbsoluteError": 0, + "name": "external-snapshot-is-independent-of-file-and-preview-cache", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "name": "external-preparation-cancellation", + "pass": true + } + ], + "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/5AF8CE34-989A-4370-8611-D2DF3D3A59A3", + "scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document.", + "candidateShaderSHA256": "034fdf3de0c8ab0ac8eacc8f8a4bd6fbb8ee8c8c93ed3af61363c8175f0196e2", + "referenceSHA256": "dc6191682c73c5ae88484af3ef2b38499880c1ccafc78e5c0ab7141612ebe458" +} diff --git a/verification/SpiderMath.json b/verification/SpiderMath.json new file mode 100644 index 0000000..e2e4842 --- /dev/null +++ b/verification/SpiderMath.json @@ -0,0 +1,10 @@ +{ + "pass": true, + "output": "PASS spider_mesh: 204683 assertions, 25 topologies, 2005 colors/grid, CPU/Metal max relative error 1.78813934e-06", + "assertions": 204683, + "topologies": 25, + "colorsPerGrid": 2005, + "maxRelativeError": 1.78813934e-06, + "source": "tools/verify_spider_mesh.mm", + "coreSourceSHA256": "bdd6278e17ff4208ad94a8b0e834c817c0a3475f205dd79898e8fd88e84a19c9" +} diff --git a/大鱼调色/Plugin/DYDiagnostics.mm b/大鱼调色/Plugin/DYDiagnostics.mm index 39e7b0b..13881e4 100644 --- a/大鱼调色/Plugin/DYDiagnostics.mm +++ b/大鱼调色/Plugin/DYDiagnostics.mm @@ -4,6 +4,7 @@ #import "DYAutoGrade.h" #import "DYLUTLibrary.h" #import "DYInspector.h" +#include "DYSpiderState.h" #include #import #import @@ -19,18 +20,36 @@ @public NSMutableDictionary *_values,*_custom; BOOL _duplicate; +@public + int _undoStarts,_undoEnds;BOOL _undoActive; } @end @interface DYInspector (DiagnosticActions) - (void)refresh; +- (void)resetAll:(id)sender; +@end +@protocol DYSpiderProbe +@property(nonatomic,copy) NSData *meshData; +@property(nonatomic,retain) NSMutableIndexSet *selection,*pinned; +@property(nonatomic,copy) void(^changed)(DYGrade,NSData*); +@property(nonatomic,copy) void(^gesture)(BOOL); +@property(nonatomic,readonly) NSInteger hueCount,saturationCount; +- (void)changeHueCount:(int)hues saturationCount:(int)saturation; +- (void)resetMesh; +- (NSPoint)point:(NSInteger)index; +- (void)selectRing; +- (void)selectSpoke; +- (void)resetSelected; @end @implementation DYDiagnosticManager - (instancetype)init {if((self=[super init])){_values=[NSMutableDictionary new];_custom=[NSMutableDictionary new];}return self;} - (void)dealloc {[_values release];[_custom release];[super dealloc];} - (id)apiForProtocol:(Protocol *)protocol { NSString *name=NSStringFromProtocol(protocol); - return [@[@"FxParameterCreationAPI_v5",@"FxParameterRetrievalAPI_v6",@"FxParameterSettingAPI_v6",@"FxCustomParameterActionAPI_v4"]containsObject:name]?self:nil; + return [@[@"FxParameterCreationAPI_v5",@"FxParameterRetrievalAPI_v6",@"FxParameterSettingAPI_v6",@"FxCustomParameterActionAPI_v4",@"FxUndoAPI"]containsObject:name]?self:nil; } +- (BOOL)startUndoGroup:(NSString *)title{_undoStarts++;_undoActive=YES;return YES;} +- (BOOL)endUndoGroup{_undoEnds++;_undoActive=NO;return YES;} - (void)startAction:(id)sender{} - (void)endAction:(id)sender{} - (CMTime)currentTime{return kCMTimeZero;} @@ -169,12 +188,12 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool { DYDiagnosticManager *uiHost=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(uiHost,nil); DYInspector *inspector=[[[DYInspector alloc]initWithAPIManager:uiHost]autorelease];[inspector refresh]; NSArray *cards=[inspector valueForKey:@"cards"];BOOL initialUI=YES; - for(NSDictionary *card in cards)initialUI&=([card[@"collapsed"]boolValue]!=[@[@"primary",@"base"]containsObject:card[@"section"][@"key"]])&&[(NSButton*)card[@"enabled"]state]==NSControlStateValueOn; - run.record(@"default-primary-base-expanded-all-eyes-on",initialUI,@{@"modules":@(cards.count)}); + for(NSDictionary *card in cards)initialUI&=([card[@"collapsed"]boolValue]!=[@[@"primary",@"spider",@"base"]containsObject:card[@"section"][@"key"]])&&[(NSButton*)card[@"enabled"]state]==NSControlStateValueOn; + run.record(@"default-primary-spider-base-expanded-all-eyes-on",initialUI,@{@"modules":@(cards.count)}); DYUniforms uiBefore,uiAfter;DYReadUniforms(uiHost,kCMTimeZero,&uiBefore);BOOL foldingIndependent=YES; for(NSDictionary *card in cards){NSButton *header=card[@"header"];BOOL was=[card[@"collapsed"]boolValue];[header performClick:nil];[inspector refresh];DYReadUniforms(uiHost,kCMTimeZero,&uiAfter);foldingIndependent&=[card[@"collapsed"]boolValue]!=was&&memcmp(&uiBefore,&uiAfter,sizeof(uiBefore))==0;[header performClick:nil];[inspector refresh];} run.record(@"all-disclosure-actions-preserve-every-render-parameter",foldingIndependent); - NSDictionary *first=cards[0];BOOL wasFolded=[first[@"collapsed"]boolValue];[(NSButton*)first[@"enabled"]performClick:nil];[inspector refresh];DYReadUniforms(uiHost,kCMTimeZero,&uiAfter); + NSDictionary *first=cards[0];if(![first[@"collapsed"]boolValue]){[(NSButton*)first[@"header"]performClick:nil];[inspector refresh];}BOOL wasFolded=[first[@"collapsed"]boolValue];[(NSButton*)first[@"enabled"]performClick:nil];[inspector refresh];DYReadUniforms(uiHost,kCMTimeZero,&uiAfter); run.record(@"eye-only-toggles-enable-retains-disclosure",[first[@"collapsed"]boolValue]==wasFolded&&uiAfter.inputSectionEnabled==0); [(NSButton*)first[@"header"]performClick:nil];[inspector refresh];DYReadUniforms(uiHost,kCMTimeZero,&uiAfter); run.record(@"expanding-disabled-module-keeps-it-disabled",uiAfter.inputSectionEnabled==0&&![first[@"collapsed"]boolValue]); @@ -188,6 +207,38 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool { DYCMSettings converted=defaults.cm;converted.exposure=1.25;converted.contrast=.4;converted.balanceStrength=.3;converted.midtones=.6;converted.shadows=-.4;converted.black=.2;converted.shadowContrast=.3;converted.hiContrast=-.2;DayuRenderParams mapped=DYCMRender(converted); run.record(@"basis-raw-controls-use-reference-conversion",fabs(mapped.basis.exposure-exp2f(1.25))<1e-6&&fabs(mapped.basis.contrast-exp2f(.4))<1e-6&&fabs(mapped.basis.balanceStrength-.36)<1e-6&&fabs(mapped.basis.midtones-.1998)<1e-5&&fabs(mapped.basis.shadows+.6)<1e-6&&fabs(mapped.basis.trimLow-.9)<1e-6&&fabs(mapped.basis.shadowContrast+.39)<1e-6&&fabs(mapped.basis.hiContrast+.4)<1e-6); converted.workingTransfer=30;mapped=DYCMRender(converted);run.record(@"unsupported-basis-curve-adapts-through-intermediate",(mapped.reserved&8)&&mapped.basis.colorspace==10&&mapped.basisInput.inputTransfer==30&&mapped.basisOutput.outputTransfer==30); + [inspector resetAll:nil];[inspector refresh]; + NSWindow *interactionWindow=[[[NSWindow alloc]initWithContentRect:NSMakeRect(0,0,400,780) styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO]autorelease];interactionWindow.contentView=inspector;[inspector layoutSubtreeIfNeeded]; + NSArray *graphics=[inspector valueForKey:@"graphics"];NSView *wheel=nil;for(NSView *graphic in graphics)if([NSStringFromClass(graphic.class)isEqual:@"DYPrimaryBalanceWheel"])wheel=graphic; + run.need(@"primary-balance-wheel-restored-and-palette-loaded",wheel&&[wheel valueForKey:@"wheel"]!=nil); + BOOL merged=cards.count==12&&[cards[0][@"section"][@"key"]isEqual:@"primary"]&&[cards[1][@"section"][@"key"]isEqual:@"spider"];for(NSDictionary *card in cards)merged&=![@[@"input",@"output"]containsObject:card[@"section"][@"key"]]; + NSDictionary *controls=[inspector valueForKey:@"controls"];for(NSDictionary *record in controls.allValues)merged&=![[record[@"descriptor"]objectForKey:@"key"]hasPrefix:@"cmbypass"]; + run.record(@"single-primary-card-no-bypass-checkboxes",merged); + auto mouseFor=[&](NSView *view,NSEventType type,NSPoint point,NSEventModifierFlags flags=0,NSInteger clicks=1){return [NSEvent mouseEventWithType:type location:[view convertPoint:point toView:nil] modifierFlags:flags timestamp:0 windowNumber:interactionWindow.windowNumber context:nil eventNumber:0 clickCount:clicks pressure:type==NSEventTypeLeftMouseUp?0:1];}; + [wheel setFrameSize:NSMakeSize(310,232)];NSPoint wheelCenter=NSMakePoint(155,126);int starts=uiHost->_undoStarts,ends=uiHost->_undoEnds; + [wheel mouseDown:mouseFor(wheel,NSEventTypeLeftMouseDown,wheelCenter)];[wheel mouseDragged:mouseFor(wheel,NSEventTypeLeftMouseDragged,NSMakePoint(wheelCenter.x+25,wheelCenter.y+10))];[wheel mouseUp:mouseFor(wheel,NSEventTypeLeftMouseUp,NSMakePoint(wheelCenter.x+50,wheelCenter.y+20))];DYReadUniforms(uiHost,kCMTimeZero,&uiAfter); + float expectedStrength=hypotf(10,4)/90.f,expectedAngle=fmodf(atan2f(4,10)*180/M_PI+360-104,360); + run.record(@"balance-wheel-reference-orientation-and-fine-drag",fabs(uiAfter.cm.balanceStrength-expectedStrength)<1e-5&&fabs(uiAfter.cm.balanceAngle-expectedAngle)<1e-4&&uiAfter.cm.balanceAngle>1,@{@"angleDegrees":@(uiAfter.cm.balanceAngle),@"strength":@(uiAfter.cm.balanceStrength)}); + run.record(@"balance-drag-one-host-undo-group",uiHost->_undoStarts==starts+1&&uiHost->_undoEnds==ends+1&&!uiHost->_undoActive); + [wheel mouseDown:mouseFor(wheel,NSEventTypeLeftMouseDown,wheelCenter,0,2)];DYReadUniforms(uiHost,kCMTimeZero,&uiAfter);run.record(@"balance-double-click-neutral",uiAfter.cm.balanceStrength==0); + NSView *spiderPanel=[inspector valueForKey:@"spiderPanel"];NSView *disc=(id)[spiderPanel valueForKey:@"disc"];[disc setFrameSize:NSMakeSize(310,300)];auto initialMesh=DYSpiderMesh(disc.meshData); + run.record(@"spider-default-six-by-six-31-nodes",initialMesh.hues==6&&initialMesh.rings==5&&dy::meshCount(initialMesh)==31); + auto selectNode=[&](int index,NSEventModifierFlags flags){NSPoint pt=[disc point:index];[disc mouseDown:mouseFor(disc,NSEventTypeLeftMouseDown,pt,flags)];[disc mouseUp:mouseFor(disc,NSEventTypeLeftMouseUp,pt,flags)];}; + auto dragNode=[&](int index,float dx,float dy){NSPoint pt=[disc point:index];[disc mouseDown:mouseFor(disc,NSEventTypeLeftMouseDown,pt)];[disc mouseDragged:mouseFor(disc,NSEventTypeLeftMouseDragged,NSMakePoint(pt.x+dx*.5,pt.y+dy*.5))];[disc mouseDragged:mouseFor(disc,NSEventTypeLeftMouseDragged,NSMakePoint(pt.x+dx,pt.y+dy))];[disc mouseUp:mouseFor(disc,NSEventTypeLeftMouseUp,NSMakePoint(pt.x+dx,pt.y+dy))];}; + starts=uiHost->_undoStarts;ends=uiHost->_undoEnds;dragNode(2,18,8);DYAssetState *spiderSaved=DYReadAssets(uiHost,kCMTimeZero);auto dragged=DYSpiderMesh(spiderSaved.spiderMesh); + run.record(@"spider-single-drag-spoke-following-and-pin",dragged.x[0]>initialMesh.x[0]&&dragged.x[1]>initialMesh.x[1]&&dragged.x[3]>initialMesh.x[3]&&dragged.x[4]==initialMesh.x[4]&&dragged.x[5]==initialMesh.x[5]&&dragged.pins[2]); + run.record(@"spider-drag-one-host-undo-group",uiHost->_undoStarts==starts+1&&uiHost->_undoEnds==ends+1&&!uiHost->_undoActive); + error=nil;NSData *spiderArchive=[NSKeyedArchiver archivedDataWithRootObject:spiderSaved requiringSecureCoding:YES error:&error];DYAssetState *decodedSpider=[NSKeyedUnarchiver unarchivedObjectOfClass:DYAssetState.class fromData:spiderArchive error:&error];run.record(@"spider-archive-retains-mesh-pins-and-lut-paths",decodedSpider&&[decodedSpider isEqual:spiderSaved],@{@"error":reason(error)}); + NSDictionary *snapshot=[inspector performSelector:@selector(presetSnapshot)];NSData *presetJSON=[NSJSONSerialization dataWithJSONObject:snapshot options:0 error:&error];NSDictionary *decodedPreset=[NSJSONSerialization JSONObjectWithData:presetJSON options:0 error:&error];run.record(@"complete-version-three-preset-includes-mesh",[decodedPreset[@"version"]isEqual:@3]&&[DYSpiderFromJSON(decodedPreset[@"spider"])isEqual:spiderSaved.spiderMesh]); + NSDictionary *portable=DYSpiderJSON(spiderSaved.spiderMesh,spiderSaved.spiderLinked);NSData *decodedPortable=DYSpiderFromJSON(portable);run.record(@"spider-json-preset-exact-roundtrip",[decodedPortable isEqual:spiderSaved.spiderMesh]); + NSMutableDictionary *badJSON=[[portable mutableCopy]autorelease];badJSON[@"hues"]=@7;run.record(@"spider-json-rejects-unsupported-topology",!DYSpiderFromJSON(badJSON));auto corrupt=dragged;corrupt.x[0]=NAN;run.record(@"spider-archive-rejects-nonfinite-coordinates",!DYSpiderMeshIsValid([NSData dataWithBytes:&corrupt length:sizeof(corrupt)])); + [disc changeHueCount:12 saturationCount:8];spiderSaved=DYReadAssets(uiHost,kCMTimeZero);auto dense=DYSpiderMesh(spiderSaved.spiderMesh);run.record(@"spider-independent-resolution-and-resample",dense.hues==12&&dense.rings==7&&fabs(dy::meshDelta(dense,0,.6).x)>0); + [disc resetMesh];auto resetDense=DYSpiderMesh(DYReadAssets(uiHost,kCMTimeZero).spiderMesh);run.record(@"spider-reset-preserves-density",resetDense.hues==12&&resetDense.rings==7&&dy::meshSamples(resetDense)[4]==0); + [disc changeHueCount:6 saturationCount:6];selectNode(1,0);selectNode(2,NSEventModifierFlagCommand);run.record(@"spider-command-multiselect",disc.selection.count==2);[disc selectRing];run.record(@"spider-ring-selection",disc.selection.count==12);[disc.selection removeAllIndexes];selectNode(0,0);[disc selectSpoke];run.record(@"spider-spoke-selection",disc.selection.count==5); + selectNode(3,NSEventModifierFlagShift);run.record(@"spider-shift-pin",[disc.pinned containsIndex:3]);float pinnedX=DYSpiderMesh(disc.meshData).x[3];dragNode(3,8,0);run.record(@"spider-pinned-anchor-still-draggable",DYSpiderMesh(disc.meshData).x[3]>pinnedX); + NSPoint resetPoint=[disc point:3];[disc rightMouseDown:mouseFor(disc,NSEventTypeRightMouseDown,resetPoint)];run.record(@"spider-right-click-reset-unpins",!DYSpiderMesh(disc.meshData).pins[3]); + [disc resetMesh];NSData *beforeCancel=[[disc.meshData copy]autorelease];NSPoint anchor=[disc point:2];[disc mouseDown:mouseFor(disc,NSEventTypeLeftMouseDown,anchor)];[disc mouseDragged:mouseFor(disc,NSEventTypeLeftMouseDragged,NSMakePoint(anchor.x+10,anchor.y+5))];[disc keyDown:[NSEvent keyEventWithType:NSEventTypeKeyDown location:NSZeroPoint modifierFlags:0 timestamp:0 windowNumber:interactionWindow.windowNumber context:nil characters:@"\x1b" charactersIgnoringModifiers:@"\x1b" isARepeat:NO keyCode:53]];run.record(@"spider-escape-restores-coordinates-and-pins",[beforeCancel isEqual:disc.meshData]); + run.record(@"native-interaction-window-never-visible",!interactionWindow.visible);[inspector resetAll:nil];[inspector refresh]; id gpu=MTLCreateSystemDefaultDevice();run.need(@"metal-device",gpu!=nil);gpuName=gpu.name; const NSUInteger width=64,height=48;DYDiagnosticTile *source=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:width height:height]autorelease],*destination=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:width height:height]autorelease]; run.need(@"real-iosurface-image-tiles",source&&destination&&source.ioSurface&&destination.ioSurface); @@ -200,7 +251,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool { error=nil;idoracle=[gpu newLibraryWithURL:[NSURL fileURLWithPath:cstReference] error:&error];run.need(@"independent-installed-cst-reference-loaded",oracle!=nil,@{@"path":cstReference,@"error":reason(error)}); const int cases[][3]={{28,27,10},{2,23,10},{4,4,10},{5,5,10},{6,6,10},{8,7,10},{9,7,10},{11,10,10},{12,28,10},{15,23,10},{16,17,10},{21,23,10},{22,21,10},{25,24,10},{27,25,10},{30,23,10},{29,23,10},{28,27,1},{28,27,20},{28,27,30},{28,27,1002}}; for(unsigned index=0;indexselected;selected[2]=1;mesh=dy::moveMesh(mesh,selected,-.035f,.04f);NSData *data=[NSData dataWithBytes:&mesh length:sizeof(mesh)];DYUniforms warped=defaults; + error=nil;BOOL ok=[renderer renderSource:source destination:destination uniforms:warped paths:@{} spider:data error:&error];Pixels frame=read(destination,gpu);auto samples=dy::meshSamples(mesh);BOOL parity=ok;double maximum=0;NSUInteger affected=0; + for(NSUInteger i=0;i0)for(int c=0;c<3;c++)rgb[c]=(__fp16)((float)input[i*4+c]/alpha);float3 expected=dyLimit(dyVariableSpider(rgb,hues,saturation-1,samples.data()));for(int c=0;c<3;c++){float value=alpha>0?(__fp16)((float)(__fp16)expected[c]*alpha):0;double delta=fabs(value-(float)frame[i*4+c]);maximum=fmax(maximum,delta);parity&=std::isfinite(frame[i*4+c])&&delta<.003;affected+=fabs((float)frame[i*4+c]-(float)neutral[i*4+c])>.001;}} + run.record([NSString stringWithFormat:@"spider-production-cpu-parity-%d-%d",hues,saturation],parity&&affected>0,@{@"maximumError":@(maximum),@"affectedComponents":@(affected),@"error":reason(error)}); + warped.spiderSectionEnabled=0;[renderer renderSource:source destination:destination uniforms:warped paths:@{} spider:data error:&error];run.record([NSString stringWithFormat:@"spider-eye-retains-but-bypasses-%d-%d",hues,saturation],difference(neutral,read(destination,gpu)).maximum==0); + }} + DYUniforms masterProbe=defaults;masterProbe.cm.configured=1;masterProbe.cm.exposure=.7;Pixels masterOn=render(run,renderer,source,destination,gpu,masterProbe,@{},@"primary-master-active-render");masterProbe.primarySectionEnabled=0;Pixels masterOff=render(run,renderer,source,destination,gpu,masterProbe,@{},@"primary-master-inactive-render");run.record(@"primary-master-controls-complete-cst-pipeline",difference(neutral,masterOn).different>100&&difference(neutral,masterOff).maximum==0); auto checkFoldedGroup=[&](DYUniforms active,NSUInteger offset,NSDictionary *paths,NSString *name){ *(float *)((uint8_t *)&active+offset)=0; Pixels folded=render(run,renderer,source,destination,gpu,active,paths,[name stringByAppendingString:@"-render"]); @@ -259,6 +318,12 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool { BOOL cstCubeMatches=cstExported&&cubeValues.size()==33*33*33*3;for(int c=0;c<3&&cstCubeMatches;c++){float code=cubeValues[((16*33+16)*33+16)*3+c];float linear=code<=.04045f?code/12.92f:powf((code+.055f)/1.055f,2.4f);cstCubeMatches&=fabs(linear-(float)grayRendered[c])<.002&&fabs(code-.5f)>.01;} run.record(@"cube-export-includes-cst-primary-and-matches-production",cstCubeMatches,@{@"error":reason(error),@"triples":@(cubeValues.size()/3)}); [[source metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0 withBytes:input.data() bytesPerRow:width*8]; + auto exportMesh=dy::neutralMesh();for(int i=0;imeshValues; + for(NSString *line in [meshText componentsSeparatedByCharactersInSet:NSCharacterSet.newlineCharacterSet]){float r,g,b;if(sscanf(line.UTF8String,"%f %f %f",&r,&g,&b)==3){meshValues.push_back(r);meshValues.push_back(g);meshValues.push_back(b);}} + auto meshSamples=dy::meshSamples(exportMesh);float3 exportInput={0,0,0};float codes[3]={.5f,.25f,.75f};for(int c=0;c<3;c++)exportInput[c]=(__fp16)powf((codes[c]+.055f)/1.055f,2.4f);float3 exportExpected=dyLimit(dyVariableSpider(exportInput,6,5,meshSamples.data()));BOOL meshCubeMatches=meshValues.size()==33*33*33*3; + for(int c=0;c<3&&meshCubeMatches;c++){float code=meshValues[((24*33+8)*33+16)*3+c],linear=code<=.04045f?code/12.92f:powf((code+.055f)/1.055f,2.4f);meshCubeMatches&=fabs(linear-exportExpected[c])<.002;} + run.record(@"cube-export-includes-spider-warp",meshCubeMatches,@{@"triples":@(meshValues.size()/3),@"error":reason(error)}); DYUniforms u=defaults;u.exposure=.8f;Pixels exposed=render(run,renderer,source,destination,gpu,u,@{},@"renderer-exposure-pass");Difference exposureDifference=difference(neutral,exposed);run.record(@"exposure-affects-actual-frame",exposureDifference.nonfinite==0&&exposureDifference.different>100,measure(exposureDifference)); u.baseSectionEnabled=0;Pixels bypass=render(run,renderer,source,destination,gpu,u,@{},@"renderer-base-bypass-pass");Difference bypassDifference=difference(neutral,bypass);run.record(@"base-group-bypass",bypassDifference.nonfinite==0&&bypassDifference.maximum==0,measure(bypassDifference)); u=defaults;u.temperature=35;u.tint=-20;Pixels wb=render(run,renderer,source,destination,gpu,u,@{},@"renderer-white-balance-pass");Difference wbDifference=difference(neutral,wb);run.record(@"white-balance-real-table-frame",wbDifference.nonfinite==0&&wbDifference.different>100,measure(wbDifference)); @@ -292,9 +357,10 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool { [externalRenderer prepareLUTPath:external completion:^(NSError *failure){preparationError=[failure retain];prepared=YES;}]; double deadline=NSProcessInfo.processInfo.systemUptime+30; while(!prepared&&NSProcessInfo.processInfo.systemUptime0&&maxGap<.15,@{@"heartbeats":@(beats),@"maximumGapMS":@(maxGap*1000)}); + run.record(@"external-activation-main-loop-responsive",maxGap<.15,@{@"heartbeats":@(beats),@"maximumGapMS":@(maxGap*1000)}); DYUniforms externalUniforms=defaults;externalUniforms.lookSectionEnabled=1;externalUniforms.postLUTStrength=1; NSDictionary *externalPaths=@{@"look0":external}; Pixels externalFrame=render(run,externalRenderer,source,destination,gpu,externalUniforms,externalPaths,@"external-first-frame-after-preparation"); diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index 74d1a71..55aadbc 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -845,7 +845,7 @@ static NSImage *DYWheelImage(void) { } - (void)useCST:(id)sender { id a=[self actionAPI];if(!a)return;[a startAction:self]; - @try{id set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];[set setFloatValue:1 toParameter:2236 atTime:a.currentTime];} @finally{[a endAction:self];}[self postChanged]; + @try{id set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];[set setFloatValue:1 toParameter:2236 atTime:a.currentTime];[self clearPrimaryBypasses:set time:a.currentTime];} @finally{[a endAction:self];}[self postChanged]; } - (void)resetSection:(NSButton *)sender { [self cancelAssetLoads];