WIP: merge CST controls, port variable spider and restore primary balance wheel; regression pending

这个提交包含在:
mac 于 2026-11-01 20:15:26 +08:00 提交
1 父节点 cf5a97cac9
当前提交 ac164245aa
23 个文件已更改
+689 -53

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

+8 -1
查看文件
@@ -1,5 +1,6 @@
#include <metal_stdlib>
#include "DYUniforms.h"
#include "SpiderCore/DYColorMath.h"
using namespace metal;
// The linked, versioned AIR helper owns color arithmetic only. Its source is in
@@ -39,7 +40,9 @@ fragment half4 dyFragment(DYRaster in [[stage_in]],
constant DYUniforms& uniforms [[buffer(0)]],
constant float& sceneLevel [[buffer(1)]],
constant DYRenderOptions& options [[buffer(2)]],
constant DYUniforms& colorUniforms [[buffer(3)]]) {
constant DYUniforms& colorUniforms [[buffer(3)]],
device const float* spiderSamples [[buffer(4)]],
constant int2& spiderSize [[buffer(5)]]) {
constexpr sampler sampleFilter(coord::normalized, address::clamp_to_edge, filter::linear);
half4 sample = source.sample(sampleFilter, in.uv);
if (!(sample.a > half(0.0))) return half4(0.0h);
@@ -49,6 +52,10 @@ fragment half4 dyFragment(DYRaster in [[stage_in]],
half4 color=dy_grade(sample,in.uv,source,preLUT,look1,look2,look3,look4,look5,hslMixer,whiteBalance,colorGrading,colorUniforms,sceneLevel);
result.rgb=mix(color.rgb,result.rgb,half(options.blackWhiteMix));
}
if(spiderSize.x>0 && uniforms.spiderSectionEnabled>.5f && uniforms.spiderMix>0.0f){
float3 color=float3(result.rgb);float3 warped=dyVariableSpider(color,spiderSize.x,spiderSize.y,spiderSamples);
result.rgb=half3(dyLimit(mix(color,warped,uniforms.spiderMix)));
}
result.a = sample.a;
if (options.outputPremultiplied) result.rgb *= result.a;
return result;