feat: finalize compact canvas shared-mask drawing and workspace synchronization

这个提交包含在:
mac 于 2026-11-05 03:28:48 +08:00 提交
1 父节点 ca352248c1
当前提交 385fb47f14
19 个文件已更改
+259 -65

没有与搜索条件相匹配的文件

@@ -36,3 +36,30 @@
}
run.record(@"workspace-six-mask-editors-fit-377-600-860-1200-point-widths",compactFits&&compactRows);
}
// Exercise the actual IOSurface/Metal path against independently owned masks.
// This reference never uses the shared-reference expander to construct masks.
{
[[source metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0 withBytes:input.data() bytesPerRow:width*8];
DYUniforms active=defaults;active.skinProtection.x=0;active.hslSectionEnabled=1;active.spiderSectionEnabled=1;active.spiderMix=1;
active.hslHueA=active.hslHueB=(DYFloat4){24,24,24,24};active.hslSatA=active.hslSatB=(DYFloat4){25,25,25,25};
auto mesh=dy::neutralMesh(6,6);std::bitset<dy::SpiderMeshCapacity>selected;for(int i=0;i<dy::meshCount(mesh);i++)if(!dy::meshBoundary(mesh,i))selected[i]=true;mesh=dy::moveMesh(mesh,selected,-.045f,.035f);NSData *meshData=[NSData dataWithBytes:&mesh length:sizeof(mesh)];
NSMutableDictionary *sharedDocument=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document),*sharedMask=(id)DYAddSharedMask(sharedDocument,DYMaskRectangle);NSString *sharedID=sharedMask[@"id"];
DYMaskParameters geometry=DYMaskAtTime(sharedMask,kCMTimeZero);geometry.centerX=.28;geometry.centerY=.5;geometry.width=.35;geometry.height=.7;geometry.feather=0;sharedMask[@"parameters"]=[NSData dataWithBytes:&geometry length:sizeof(geometry)];
run.need(@"gpu-shared-hsl-spider-use-one-rectangle-author",DYSetSharedMaskAssigned(sharedDocument,sharedID,@"base:hsl",YES)&&DYSetSharedMaskAssigned(sharedDocument,sharedID,@"base:spider",YES)&&DYValidToolDocument(sharedDocument));
auto independentDocument=[&](){NSMutableDictionary *reference=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document);for(NSString *type in @[@"hsl",@"spider"]){NSMutableDictionary *copy=DYMutablePlist(sharedMask);copy[@"id"]=NSUUID.UUID.UUIDString;reference[@"baseMasks"][type]=[NSMutableArray arrayWithObject:copy];}return reference;};
auto renderAt=[&](NSDictionary *document,CMTime time,DYUniforms uniforms,NSString *name){NSError *failure=nil;NSDictionary *snapshot=DYToolRenderSnapshot(document,time);BOOL valid=DYValidToolDocument(snapshot);BOOL rendered=valid&&[renderer renderSource:source destination:destination uniforms:uniforms paths:@{} spider:meshData tools:snapshot error:&failure];run.need(name,rendered,@{@"error":reason(failure),@"validSnapshot":@(valid)});return read(destination,gpu);};
auto alphaPreserved=[&](const Pixels& pixels){if(pixels.size()!=input.size())return false;for(NSUInteger i=3;i<input.size();i+=4)if(pixels[i]!=input[i])return false;return true;};
Pixels first=renderAt(sharedDocument,kCMTimeZero,active,@"gpu-shared-hsl-spider-initial-render"),reference=renderAt(independentDocument(),kCMTimeZero,active,@"gpu-independent-hsl-spider-initial-reference");Difference initialError=difference(first,reference);
run.record(@"gpu-shared-hsl-spider-equals-two-independent-masks-per-pixel",initialError.nonfinite==0&&initialError.maximum<.0001&&alphaPreserved(first)&&alphaPreserved(reference),measure(initialError));
DYUniforms hslOnly=active,spiderOnly=active;hslOnly.spiderSectionEnabled=0;spiderOnly.hslSectionEnabled=0;Pixels hslFrame=renderAt(sharedDocument,kCMTimeZero,hslOnly,@"gpu-shared-hsl-only-control"),spiderFrame=renderAt(sharedDocument,kCMTimeZero,spiderOnly,@"gpu-shared-spider-only-control");
run.record(@"gpu-shared-region-both-hsl-and-spider-affect-real-pixels",difference(first,hslFrame).different>10&&difference(first,spiderFrame).different>10);
geometry.centerX=.72;sharedMask[@"parameters"]=[NSData dataWithBytes:&geometry length:sizeof(geometry)];Pixels edited=renderAt(sharedDocument,kCMTimeZero,active,@"gpu-shared-edited-rectangle-render"),editedReference=renderAt(independentDocument(),kCMTimeZero,active,@"gpu-independent-edited-rectangle-reference");Difference editedError=difference(edited,editedReference),editedChange=difference(first,edited);
run.record(@"gpu-editing-unique-shared-geometry-updates-both-operations",editedError.nonfinite==0&&editedError.maximum<.0001&&editedChange.different>20&&alphaPreserved(edited),@{@"maximumReferenceError":@(editedError.maximum),@"changedComponents":@(editedChange.different),@"uniqueAuthorObjects":@(DYSharedMasks(sharedDocument).count)});
DYMaskParameters tracked=geometry;tracked.centerX=.28;BOOL merged=DYMergeTracking(sharedMask,@[DYMaskKey(kCMTimeZero,geometry,YES,1),DYMaskKey(CMTimeMake(2,24),tracked,NO,.93)]);CMTime middle=CMTimeMake(1,24);Pixels animated=renderAt(sharedDocument,middle,active,@"gpu-shared-tracking-middle-render"),animatedReference=renderAt(independentDocument(),middle,active,@"gpu-independent-tracking-middle-reference");Difference trackingError=difference(animated,animatedReference),trackingChange=difference(edited,animated);
run.record(@"gpu-one-shared-trajectory-drives-hsl-and-spider-per-frame",merged&&trackingError.nonfinite==0&&trackingError.maximum<.0001&&trackingChange.different>20&&alphaPreserved(animated)&&DYSharedMasks(sharedDocument).count==1&&[DYMasksForTool(sharedDocument,@"base:hsl").firstObject[@"keys"]count]==2&&DYMasksForTool(sharedDocument,@"base:hsl").firstObject==DYMasksForTool(sharedDocument,@"base:spider").firstObject,@{@"maximumReferenceError":@(trackingError.maximum),@"changedComponents":@(trackingChange.different),@"evaluatedCenterX":@(DYMaskAtTime(sharedMask,middle).centerX)});
// Use the real preset serializer, then the same JSON/base64-plist path that
// loadPreset validates, with a separate manager so other fixtures stay intact.
DYDiagnosticManager *presetHost=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(presetHost,&error);DYWriteTools(presetHost,sharedDocument,kCMTimeZero);DYAssetState *presetAssets=[[[DYAssetState alloc]init]autorelease];presetAssets.spiderMesh=meshData;presetAssets.spiderLinked=YES;DYWriteAssets(presetHost,presetAssets,kCMTimeZero);DYInspector *presetInspector=[[[DYInspector alloc]initWithAPIManager:presetHost renderer:renderer]autorelease];NSDictionary *preset=[presetInspector performSelector:@selector(presetSnapshot)];NSData *json=[NSJSONSerialization dataWithJSONObject:preset options:0 error:&error];NSDictionary *loaded=json?[NSJSONSerialization JSONObjectWithData:json options:0 error:&error]:nil;NSData *toolBytes=[loaded[@"tools"]isKindOfClass:NSString.class]?[[[NSData alloc]initWithBase64EncodedString:loaded[@"tools"] options:0]autorelease]:nil;NSDictionary *restored=toolBytes?[NSPropertyListSerialization propertyListWithData:toolBytes options:NSPropertyListImmutable format:NULL error:&error]:nil;
run.record(@"preset-v7-json-roundtrip-preserves-unique-shared-object-and-trajectory",[loaded[@"version"]isEqual:@7]&&[loaded[@"format"]isEqual:@"com.dayu.color.preset"]&&DYValidToolDocument(restored)&&[restored isEqual:sharedDocument]&&DYSharedMasks(restored).count==1&&DYToolIDsForSharedMask(restored,sharedID).count==2&&[DYSpiderFromJSON(loaded[@"spider"])isEqual:meshData]);
}