fix: preserve native reference and partial black-white branches for anchored layers; pass 281 native integration checks
这个提交包含在:
1 父节点
0b53fdcdfd
当前提交
7bac613f4a
15 个文件已更改
+129
-32
没有与搜索条件相匹配的文件
@@ -17,9 +17,27 @@
|
||||
NSMutableDictionary *extra=(id)doc[@"layers"][0];extra[@"values"][@"hsl1_2"]=@55;DYUniforms baseHSLOnly=base;baseHSLOnly.colorGradingSectionEnabled=0;Pixels first=render(run,renderer,source,destination,gpu,baseHSLOnly,@{},@"insertion-base-hsl-reference");DYDiagnosticTile *intermediate=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:width height:height]autorelease];upload(intermediate,first);Pixels second=render(run,renderer,intermediate,destination,gpu,DYToolUniforms(extra),@{},@"insertion-extra-hsl-reference");upload(intermediate,second);DYUniforms grading=DYToolUniforms(@{@"type":@"grading"});grading.colorGradingHueSatA.x=210;grading.colorGradingHueSatA.y=42;grading.colorGradingLuma.x=18;Pixels expected=render(run,renderer,intermediate,destination,gpu,grading,@{},@"insertion-later-native-grading-reference");Pixels actual=renderInserted(doc,base,@"anchored-hsl-before-grading-render");run.record(@"anchored-hsl-executes-before-later-native-grading",difference(expected,actual).maximum<.004,measure(difference(expected,actual)));
|
||||
NSMutableDictionary *tail=DYMutablePlist(doc);[tail[@"layers"][0]removeObjectForKey:@"after"];tail[@"schema"]=@1;Pixels oldTail=renderInserted(tail,base,@"historical-tail-hsl-render");run.record(@"anchored-hsl-is-not-only-a-visual-move-from-tail",difference(actual,oldTail).different>20,measure(difference(actual,oldTail)));
|
||||
// Two anchors must follow the legacy native operation order, not insertion time.
|
||||
doc=DYMutablePlist(empty.document);NSMutableDictionary *hsl=(id)DYInsertTool(doc,@"hsl",@"base:hsl");hsl[@"values"][@"hsl0_0"]=@35;NSMutableDictionary *curve=(id)DYInsertTool(doc,@"curve",@"base:curve");curve[@"values"][@"curveY0"]=@.25;
|
||||
DYUniforms neutralBase=DYToolUniforms(@{@"type":@"hsl"});first=render(run,renderer,source,destination,gpu,DYToolUniforms(curve),@{},@"anchored-curve-first-reference");upload(intermediate,first);expected=render(run,renderer,intermediate,destination,gpu,DYToolUniforms(hsl),@{},@"anchored-hsl-second-reference");actual=renderInserted(doc,neutralBase,@"two-native-anchor-render");run.record(@"two-anchors-preserve-native-curve-before-hsl-operation-order",difference(expected,actual).maximum<.004,measure(difference(expected,actual)));
|
||||
first=render(run,renderer,source,destination,gpu,DYToolUniforms(hsl),@{},@"wrong-hsl-before-curve-reference");upload(intermediate,first);Pixels wrong=render(run,renderer,intermediate,destination,gpu,DYToolUniforms(curve),@{},@"wrong-curve-after-hsl-reference");run.record(@"anchor-reference-operations-are-noncommuting",difference(expected,wrong).different>20,measure(difference(expected,wrong)));
|
||||
doc=DYMutablePlist(empty.document);NSMutableDictionary *hsl=(id)DYInsertTool(doc,@"hsl",@"base:hsl");hsl[@"values"][@"hsl0_0"]=@35;NSMutableDictionary *curve=(id)DYInsertTool(doc,@"curve",@"base:curve");curve[@"values"][@"curveY4"]=@32;curve[@"values"][@"curveY5"]=@(-24);curve[@"values"][@"channel0X0"]=@.25;curve[@"values"][@"channel0X1"]=@.75;
|
||||
DYUniforms neutralBase=DYToolUniforms(@{@"type":@"hsl"});first=render(run,renderer,source,destination,gpu,DYToolUniforms(curve),@{},@"anchored-curve-first-reference");run.record(@"curve-anchor-reference-materially-adjusts-red-channel",difference(first,input).different>20&&difference(first,input).maximum>.01,measure(difference(first,input)));upload(intermediate,first);expected=render(run,renderer,intermediate,destination,gpu,DYToolUniforms(hsl),@{},@"anchored-hsl-second-reference");actual=renderInserted(doc,neutralBase,@"two-native-anchor-render");run.record(@"two-anchors-preserve-native-curve-before-hsl-operation-order",difference(expected,actual).maximum<.004,measure(difference(expected,actual)));
|
||||
first=render(run,renderer,source,destination,gpu,DYToolUniforms(hsl),@{},@"wrong-hsl-before-curve-reference");upload(intermediate,first);Pixels wrong=render(run,renderer,intermediate,destination,gpu,DYToolUniforms(curve),@{},@"wrong-curve-after-hsl-reference");run.record(@"anchor-reference-operations-are-noncommuting",difference(expected,wrong).different>20&&difference(expected,wrong).maximum>.005,measure(difference(expected,wrong)));
|
||||
|
||||
// A changed tool with a zero-strength mask forces the anchored scheduler but
|
||||
// contributes no correction. Compare against the untouched fused operation to
|
||||
// catch replayed CST, lost global-white statistics, a displaced spatial source,
|
||||
// lost pre-HSL skin reference, or moving the original Spider before color work.
|
||||
auto boundary=[&](NSString *name,DYUniforms u,NSString *anchor,NSData *mesh,NSDictionary *baseMasks=nil){
|
||||
NSMutableDictionary *control=DYMutablePlist(empty.document),*baselineDocument=DYMutablePlist(empty.document);if(baseMasks){control[@"baseMasks"]=DYMutablePlist(baseMasks);baselineDocument[@"baseMasks"]=DYMutablePlist(baseMasks);}NSMutableDictionary *node=(id)DYInsertTool(control,@"hsl",anchor);node[@"values"][@"hsl0_0"]=@32;NSMutableDictionary *mask=DYMutablePlist(DYNewMask(DYMaskRectangle));DYMaskParameters p=DYMaskAtTime(mask,kCMTimeZero);p.strength=0;mask[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];[node[@"masks"]addObject:mask];NSError *failure=nil;
|
||||
BOOL baselineOK=[renderer renderSource:source destination:destination uniforms:u paths:@{} spider:mesh tools:baselineDocument error:&failure];Pixels before=read(destination,gpu);BOOL insertedOK=[renderer renderSource:source destination:destination uniforms:u paths:@{} spider:mesh tools:control error:&failure];Pixels after=read(destination,gpu);Difference delta=difference(before,after);BOOL alpha=YES;for(NSUInteger i=0;i<width*height;i++)alpha&=before[i*4+3]==after[i*4+3];run.record(name,baselineOK&&insertedOK&&alpha&&delta.nonfinite==0&&delta.maximum<.006,measure(delta));
|
||||
};
|
||||
DYUniforms cstBoundary=defaults;cstBoundary.cm.configured=1;cstBoundary.cm.exposure=-.6;boundary(@"anchored-primary-cst-runs-once-before-native-stages",cstBoundary,@"base:primary",nil);
|
||||
DYUniforms skinBoundary=base;skinBoundary.skinProtection.x=1;skinBoundary.skinProtection.y=85;skinBoundary.skinProtection.z=28;boundary(@"anchored-split-retains-native-pre-hsl-skin-reference",skinBoundary,@"base:hsl",nil);
|
||||
DYUniforms textureBoundary=DYToolUniforms(@{@"type":@"base"});textureBoundary.whites=48;textureBoundary.texture=35;textureBoundary.clarity=25;textureBoundary.dehaze=15;textureBoundary.primariesSectionEnabled=1;textureBoundary.redPrimaryHue=20;textureBoundary.redPrimarySaturation=15;boundary(@"anchored-prefix-preserves-whites-statistics-and-spatial-base-input",textureBoundary,@"base:primaries",nil);
|
||||
DYUniforms oldInputBoundary=textureBoundary;oldInputBoundary.primarySectionEnabled=1;oldInputBoundary.inputSectionEnabled=1;oldInputBoundary.cm.configured=-1;oldInputBoundary.inputProfile=17;oldInputBoundary.preLUTStrength=1;boundary(@"anchored-legacy-input-lut-remains-available-to-spatial-neighbors",oldInputBoundary,@"base:primaries",nil);
|
||||
NSMutableDictionary *lumaMask=DYMutablePlist(DYNewMask(DYMaskLumaKey));DYMaskParameters luma=DYMaskAtTime(lumaMask,kCMTimeZero);luma.inputBlack=.25;luma.inputWhite=.8;lumaMask[@"parameters"]=[NSData dataWithBytes:&luma length:sizeof(luma)];boundary(@"anchored-original-color-mask-keeps-post-cst-source-reference",textureBoundary,@"base:primaries",nil,@{@"base":@[lumaMask]});
|
||||
DYUniforms chromaBoundary=base;chromaBoundary.baseSectionEnabled=1;chromaBoundary.colorSectionEnabled=1;chromaBoundary.saturation=45;chromaBoundary.vibrance=20;boundary(@"anchored-split-preserves-second-base-chroma-stage",chromaBoundary,@"base:hsl",nil);
|
||||
auto boundaryMesh=dy::neutralMesh();for(int i=0;i<dy::meshCount(boundaryMesh);i++){boundaryMesh.x[i]+=.04f;boundaryMesh.y[i]-=.02f;}NSData *meshData=[NSData dataWithBytes:&boundaryMesh length:sizeof(boundaryMesh)];DYUniforms spiderBoundary=base;spiderBoundary.spiderSectionEnabled=1;spiderBoundary.spiderMix=.8;boundary(@"anchored-spider-remains-after-native-color-stages",spiderBoundary,@"base:spider",meshData);
|
||||
DYUniforms bwBoundary=skinBoundary;bwBoundary.blackWhiteSectionEnabled=1;bwBoundary.cm.blackWhiteMix=.45;boundary(@"anchored-bw-suffix-defers-color-mixture-until-after-native-skin",bwBoundary,@"base:blackwhite",nil);bwBoundary.spiderSectionEnabled=1;bwBoundary.spiderMix=.8;boundary(@"anchored-look-suffix-keeps-bw-mixture-before-single-spider",bwBoundary,@"base:look",meshData);
|
||||
Pixels hdr=input;for(NSUInteger i=0;i<width*height;i++){float a=hdr[i*4+3];hdr[i*4]=a*1.35f;hdr[i*4+1]=a*.4f;hdr[i*4+2]=-a*.06f;}upload(source,hdr);boundary(@"zero-strength-extra-mask-preserves-hdr-and-negative-colors",neutralBase,@"base:primary",nil);upload(source,input);
|
||||
NSURL *cubeURL=[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:@"inserted-tool-stack.cube"]];error=nil;BOOL exported=[renderer exportLUT:cubeURL uniforms:neutralBase paths:@{} spider:nil tools:doc error:&error];NSString *text=exported?[NSString stringWithContentsOfURL:cubeURL encoding:NSUTF8StringEncoding error:&error]:nil;std::vector<float>values;for(NSString *line in [text componentsSeparatedByCharactersInSet:NSCharacterSet.newlineCharacterSet]){float r,g,b;if(sscanf(line.UTF8String,"%f %f %f",&r,&g,&b)==3){values.push_back(r);values.push_back(g);values.push_back(b);}}
|
||||
float codes[3]={.5f,.25f,.75f};Pixels solid(input.size());for(NSUInteger i=0;i<width*height;i++){for(int c=0;c<3;c++)solid[i*4+c]=powf((codes[c]+.055f)/1.055f,2.4f);solid[i*4+3]=1;}upload(source,solid);actual=renderInserted(doc,neutralBase,@"inserted-cube-production-sample");BOOL matches=exported&&values.size()==33*33*33*3;for(int c=0;c<3&&matches;c++){float code=values[((24*33+8)*33+16)*3+c],linear=code<=.04045f?code/12.92f:powf((code+.055f)/1.055f,2.4f);matches&=fabs(linear-(float)actual[c])<.004;}run.record(@"cube-export-follows-identical-anchored-tool-order",matches,@{@"error":reason(error)});
|
||||
upload(source,input);DYWriteTools(manager,empty.document,kCMTimeZero);
|
||||
|
||||
在新工单中引用
屏蔽一个用户