Tighten final color contract

This commit is contained in:
2026-04-10 01:21:00 +08:00
parent 4111f841d4
commit 4debbbea1f
4 changed files with 19 additions and 18 deletions

View File

@@ -66,7 +66,6 @@ struct FinalColorOverrideSettings {
struct ResolvedFinalColorPolicy : FinalColorSettings {
bool hasPipelineDefaults = false;
bool hasCameraOverrides = false;
bool hasVolumeOverrides = false;
};
inline void ApplyFinalColorOverrides(
@@ -95,8 +94,7 @@ inline void ApplyFinalColorOverrides(
inline ResolvedFinalColorPolicy ResolveFinalColorPolicy(
const FinalColorSettings& pipelineDefaults,
const FinalColorOverrideSettings* cameraOverrides = nullptr,
const FinalColorOverrideSettings* volumeOverrides = nullptr) {
const FinalColorOverrideSettings* cameraOverrides = nullptr) {
ResolvedFinalColorPolicy resolved = {};
resolved.outputTransferMode = pipelineDefaults.outputTransferMode;
resolved.exposureMode = pipelineDefaults.exposureMode;
@@ -110,11 +108,6 @@ inline ResolvedFinalColorPolicy ResolveFinalColorPolicy(
resolved.hasCameraOverrides = true;
}
if (volumeOverrides != nullptr && volumeOverrides->HasOverrides()) {
ApplyFinalColorOverrides(*volumeOverrides, resolved);
resolved.hasVolumeOverrides = true;
}
return resolved;
}