Make sdr white point do a thing
Bug: 182312559
Test: SilkFX prototype changes
Change-Id: Ieca0e4c8e2229d14aac460945702d23759d208e9
diff --git a/libs/renderengine/skia/SkiaGLRenderEngine.cpp b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
index acdb78a..160ffb3 100644
--- a/libs/renderengine/skia/SkiaGLRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
@@ -567,10 +567,14 @@
} else {
runtimeEffect = effectIter->second;
}
+ float maxLuminance = layer->source.buffer.maxLuminanceNits;
+ // If the buffer doesn't have a max luminance, treat it as SDR & use the display's SDR
+ // white point
+ if (maxLuminance <= 0.f) {
+ maxLuminance = display.sdrWhitePointNits;
+ }
return createLinearEffectShader(shader, effect, runtimeEffect, layer->colorTransform,
- display.maxLuminance,
- layer->source.buffer.maxMasteringLuminance,
- layer->source.buffer.maxContentLuminance);
+ display.maxLuminance, maxLuminance);
}
return shader;
}
@@ -866,7 +870,9 @@
const bool requiresLinearEffect = layer->colorTransform != mat4() ||
(mUseColorManagement &&
- needsToneMapping(layer->sourceDataspace, display.outputDataspace));
+ needsToneMapping(layer->sourceDataspace, display.outputDataspace)) ||
+ (display.sdrWhitePointNits > 0.f &&
+ display.sdrWhitePointNits != display.maxLuminance);
// quick abort from drawing the remaining portion of the layer
if (layer->alpha == 0 && !requiresLinearEffect && !layer->disableBlending &&