Prepare 1.5.0 build34 film and mixer delivery; verify 349 native and 184 reference cases
这个提交包含在:
1 父节点
f575c01893
当前提交
eeeee102cd
14 个文件已更改
+3600
-361
没有与搜索条件相匹配的文件
@@ -22,6 +22,8 @@
|
||||
value.film.mix=0;bypass=filmRender(value,nil,[NSString stringWithFormat:@"film-stage-%d-zero-mix",stage]);run.record([NSString stringWithFormat:@"film-stage-%d-zero-is-exact",stage],difference(before,bypass).maximum==0);
|
||||
value.film.mix=1;value.film.enabled=0;bypass=filmRender(value,nil,[NSString stringWithFormat:@"film-stage-%d-eye-off",stage]);run.record([NSString stringWithFormat:@"film-stage-%d-eye-preserves-old-frame",stage],difference(before,bypass).maximum==0);
|
||||
}
|
||||
DYUniforms originGrain=neutral;originGrain.film.enabled=1;originGrain.film.grainEnabled=1;originGrain.film.grainAmount=.7;originGrain.filmFrameKey=31;
|
||||
Pixels topGrain=filmRender(originGrain,nil,@"grain-top-origin-render"),bottomInput(input.size());for(NSUInteger y=0;y<height;y++)memcpy(bottomInput.data()+y*width*4,input.data()+(height-1-y)*width*4,width*8);uploadFilm(bottomInput);[source setDiagnosticImageOrigin:kFxImageOrigin_BOTTOM_LEFT];Pixels bottomGrain=filmRender(originGrain,nil,@"grain-bottom-origin-render");run.record(@"grain-canonical-coordinates-survive-texture-origin",difference(topGrain,bottomGrain).maximum==0,measure(difference(topGrain,bottomGrain)));[source setDiagnosticImageOrigin:kFxImageOrigin_TOP_LEFT];uploadFilm(input);
|
||||
CMTime duration=CMTimeMake(1001,30000),origin=CMTimeMake(17,3);BOOL rational=YES;
|
||||
for(int i=-12;i<=12;i++){CMTime t=CMTimeAdd(origin,CMTimeMultiply(duration,i));rational&=DYFilmFrameIndex(t,duration,origin)==i;for(int hold=1;hold<=5;hold++)rational&=DYFilmFrameKey(i,hold,0)==(uint32_t)(int64_t)floor(double(i)/hold);}
|
||||
rational&=DYFilmFrameIndex(CMTimeMake(-1,1000000),duration,kCMTimeZero)==-1;
|
||||
|
||||
@@ -14,8 +14,8 @@ kernel void dyFilmPoint(texture2d<float,access::read> source [[texture(0)]],text
|
||||
float amount=pass.operation==0?uniforms.mixerMix:1;
|
||||
pixel.rgb=dyLimit((c*(1-amount)+result*amount)*pixel.a);output.write(pixel,pos);
|
||||
}
|
||||
kernel void dyFilmNoise(texture2d<float,access::write> output [[texture(0)]],constant uint& seed [[buffer(0)]],uint2 pos [[thread_position_in_grid]]){
|
||||
if(pos.x>=output.get_width()||pos.y>=output.get_height())return;output.write(float4(dyFilmNormal(pos.x,pos.y,seed),1),pos);
|
||||
kernel void dyFilmNoise(texture2d<float,access::write> output [[texture(0)]],constant uint& seed [[buffer(0)]],constant uint& bottomOrigin [[buffer(1)]],uint2 pos [[thread_position_in_grid]]){
|
||||
if(pos.x>=output.get_width()||pos.y>=output.get_height())return;uint y=bottomOrigin?output.get_height()-1-pos.y:pos.y;output.write(float4(dyFilmNormal(pos.x,y,seed),1),pos);
|
||||
}
|
||||
// Separable form of the reference's sparse 5x5 prefilter: same 25 weighted
|
||||
// samples, followed by its 3x3 vector Sobel norm. Only two 5-tap passes.
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
}
|
||||
if(DYFilmGrainActive(u.film)){
|
||||
id<MTLTexture>noise=texture(2);if(!noise)return fail(error,@"无法分配颗粒缓冲区");
|
||||
id<MTLComputeCommandEncoder>ce=[commands computeCommandEncoder];[ce setComputePipelineState:entry[@"dyFilmNoise"]];[ce setTexture:noise atIndex:0];[ce setBytes:&u.filmFrameKey length:4 atIndex:0];[ce dispatchThreads:MTLSizeMake(noise.width,noise.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];
|
||||
id<MTLComputeCommandEncoder>ce=[commands computeCommandEncoder];[ce setComputePipelineState:entry[@"dyFilmNoise"]];[ce setTexture:noise atIndex:0];[ce setBytes:&u.filmFrameKey length:4 atIndex:0];unsigned bottom=source.imageOrigin==kFxImageOrigin_BOTTOM_LEFT;[ce setBytes:&bottom length:4 atIndex:1];[ce dispatchThreads:MTLSizeMake(noise.width,noise.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];
|
||||
if(u.film.grainSize>1){id<MTLTexture>smooth=texture(3);if(!smooth)return fail(error,@"无法分配颗粒扩散缓冲区");
|
||||
// Reference radius=2. Recover the same sigma search without frame state.
|
||||
double sigma=1,step=1;for(int iteration=0;iteration<20000;iteration++){double density=exp(-4/(sigma*sigma))/(sigma*sigma*6.283185307179586);if(.02/5<density){if(step<=.02)break;sigma-=step;step*=.1;}sigma+=step;if(sigma>1000){sigma=1;break;}}
|
||||
|
||||
+1
-1
@@ -174,7 +174,7 @@ static void initialize(){static dispatch_once_t once;dispatch_once(&once,^{
|
||||
FE(subtractiveEnabled,@"filmSubtractive",@"启用减色",0);
|
||||
FR(gammaAll,@"filmGammaAll",@"整体减色",.25,4,1,0);FR(gammaCyan,@"filmGammaCyan",@"青色减色",.25,4,1,0);FR(gammaMagenta,@"filmGammaMagenta",@"洋红减色",.25,4,1,0);FR(gammaYellow,@"filmGammaYellow",@"黄色减色",.25,4,1,0);FR(density,@"filmDensity",@"密度",-1,1,0,0);
|
||||
NSMutableDictionary *density=FR(densityMode,@"filmDensityMode",@"密度模式",1,2,2,0);density[@"kind"]=@"popup";density[@"values"]=@[@2,@1];density[@"options"]=@[@"模式 1 · 最大值",@"模式 2 · 平均值"];
|
||||
row(@"filmValueMode",@"胶片亮度模型",offsetof(DYUniforms,film)+offsetof(DYFilmSettings,valueMode),6,6,6,@"float");
|
||||
row(@"filmValueMode",@"胶片亮度模型",offsetof(DYUniforms,film)+offsetof(DYFilmSettings,valueMode),1,6,6,@"float");
|
||||
FE(halationEnabled,@"filmHalation",@"启用晕光",1);FR(scatter,@"filmScatter",@"散射半径",0,100,5,1);FR(dyeTransmission,@"filmTransmission",@"染料透射",0,100,0,1);FR(boost,@"filmBoost",@"晕光增强",0,5,1,1);
|
||||
FE(bloomEnabled,@"filmBloom",@"启用辉光",2);FR(sensitivity,@"filmSensitivity",@"辉光灵敏度",0,100,50,2);FR(diffusion,@"filmDiffusion",@"辉光扩散",0,100,30,2);FR(intensity,@"filmIntensity",@"辉光强度",0,100,50,2);
|
||||
FE(grainEnabled,@"filmGrain",@"启用颗粒",3);FR(grainAmount,@"filmGrainAmount",@"颗粒数量",0,1,0,3);FR(grainSize,@"filmGrainSize",@"颗粒大小",1,20,1,3);FR(grainResponse,@"filmGrainResponse",@"胶片响应",-1,1,0,3);FR(grainColor,@"filmGrainColor",@"颜色变化",0,1,0,3);
|
||||
|
||||
@@ -194,6 +194,7 @@ static void bypassIdleSkin(DYUniforms *u){
|
||||
}}}
|
||||
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths error:(NSError**)err{return [self exportLUT:url uniforms:u paths:paths spider:nil error:err];}
|
||||
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider error:(NSError**)err{@synchronized(self){
|
||||
if(DYFilmActive(u.film)&&DYFilmSpatialActive(u.film))return fail(err,@"胶片空间和颗粒处理不能保存到静态 Cube,请保存完整预设。");
|
||||
NSMutableDictionary *e=[self device:0 error:err];if(!e)return NO;id<MTLDevice>d=e[@"device"];const NSUInteger n=33,count=n*n*n,width=n*n,height=n;
|
||||
MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA16Float width:width height:height mipmapped:NO];desc.storageMode=MTLStorageModeShared;desc.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite|MTLTextureUsageRenderTarget;
|
||||
id<MTLTexture>input=[d newTextureWithDescriptor:desc],output=[d newTextureWithDescriptor:desc];if(!input||!output){[input release];[output release];return fail(err,@"无法分配 LUT 色格");}
|
||||
|
||||
+3
-3
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.4.3</string>
|
||||
<string>1.5.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>33</string>
|
||||
<string>34</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
@@ -71,7 +71,7 @@
|
||||
<key>uuid</key>
|
||||
<string>1C17B73B-F229-4C09-A434-EAF6DFF5F22A</string>
|
||||
<key>version</key>
|
||||
<string>1.4.3</string>
|
||||
<string>1.5.0</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>className</key>
|
||||
|
||||
在新工单中引用
屏蔽一个用户