Restore workspace inheritance and declared Cube output; extend CMS regressions (validation ongoing)

这个提交包含在:
mac 于 2026-11-04 07:53:14 +08:00 提交
1 父节点 0b1b4454b4
当前提交 d5aba63b4e
10 个文件已更改
+92 -10

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

+4 -1
查看文件
@@ -1,5 +1,8 @@
// Opt-in V3. The root primary owns input/working/output; V1/V2 stay frozen.
- (BOOL)renderPrimarySource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools hostPrimaries:(NSInteger)primaries error:(NSError**)error {
// The main eye bypasses the whole primary/CST module. Other tools retain
// their established unmanaged host workflow rather than inheriting a Log tag.
if(u.primarySectionEnabled<.5||DYBaseToolRemoved(tools,@"primary"))return [self renderSource:src destination:dst uniforms:u paths:paths spider:spider tools:tools error:error];
NSMutableDictionary*entry=[self device:dst.deviceRegistryID error:error];if(!entry)return NO;id<MTLDevice>d=entry[@"device"];id<MTLTexture>source=[src metalTextureForDevice:d];if(!source)return fail(error,@"一级 CST 输入纹理不可用。");
uint64_t pixels=uint64_t(source.width)*source.height;if(!pixels||pixels>64ull*1024*1024||pixels*16*8>MAX(768ull*1024*1024,MIN(2ull*1024*1024*1024,d.recommendedMaxWorkingSetSize/2)))return fail(error,@"当前画面超过一级 CST 内存预算。");
DYApplyRemovedBaseTools(&u,tools);BOOL root=u.primarySectionEnabled>.5;int wt=lroundf(u.cm.workingTransfer),wg=lroundf(u.cm.workingGamut);
@@ -27,7 +30,7 @@
BOOL outputEnabled=root&&u.cm.outputEnabled>.5;int ot=outputEnabled?lroundf(u.cm.outputTransfer):wt,og=outputEnabled?lroundf(u.cm.outputGamut):wg;
// Only this stage owns the main display rendering / tone mapping.
if(outputEnabled&&!transform(DYCMRender(u.cm).output))return NO;
u.primarySectionEnabled=0;u.cm.configured=-1;u.inputProfile=u.preLUTStrength=0;u.filmPrint.x=0;NSDictionary*finishPaths=DYVisibleBaseToolPaths(paths,finishing);NSArray*activeFinish=DYManagedActiveFinishing(u,finishPaths,spider,finishing);
u.primarySectionEnabled=0;u.cm.configured=-1;u.inputProfile=u.preLUTStrength=0;u.filmPrint.x=0;NSDictionary*finishPaths=DYVisibleBaseToolPaths(paths,finishing);NSArray*activeFinish=DYPrimaryActiveFinishing(u,finishPaths,spider,finishing);
BOOL display=outputEnabled&&ot>=1001&&ot<=1003;
if(!display&&activeFinish.count)return fail(error,@"当前是 Log/线性码值输出。SDR 修饰工具需要显示输出,请选择 Gamma 输出,或关闭这些工具并保存完整预设。");
if(display&&_exporting&&!activeFinish.count){if(!dispatch(@"dyPrimaryCodeOutput",nullptr,0))return NO;}else if(display){if(!transform({og,ot,22,20,0}))return NO;[self managedPreview:current origin:src.imageOrigin entry:entry];